Merge pull request #91315 from maralorn/fix-jsaddle-warp

[haskell-updates] haskellPackages.jsaddle-warp: Fix build
This commit is contained in:
Dennis Gosnell 2020-06-23 09:38:37 +09:00 committed by GitHub
commit 41439b4f70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions

View file

@ -1564,4 +1564,14 @@ self: super: {
sha256 = "0v6kv1d4syjzgzc2s7a76c6k4vminlcq62n7jg3nn9xd00gwmmv7";
});
# Picking fixed version constraint from upstream
# Issue: https://github.com/ghcjs/jsaddle/issues/115
# Tests disabled because they assume to run in the whole jsaddle repo and not the hackage tarbal of jsaddle-warp.
jsaddle-warp = dontCheck (appendPatch super.jsaddle-warp (pkgs.fetchpatch {
url = "https://github.com/ghcjs/jsaddle/commit/86b166033186c1724d4d52eeaf0935f0f29fe1ca.patch";
sha256 = "0j4g3hcqrandlnzr9n9mixygg86accdyk2nyj9hh9g4p7mrcyb7j";
stripLen = 2;
extraPrefix = "";
}));
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

View file

@ -6864,7 +6864,6 @@ broken-packages:
- jpeg
- js-good-parts
- jsaddle-hello
- jsaddle-warp
- jsaddle-wkwebview
- JsContracts
- jsmw

View file

@ -146266,8 +146266,6 @@ self: {
];
description = "Interface for JavaScript that works with GHCJS and GHC";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
"jsaddle-webkit2gtk" = callPackage