From 692715dc95788fa0aa1ee6f22e26037583f3a74d Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 23 Jul 2020 17:56:34 +0200 Subject: [PATCH] haskellPackages.jsaddle-warp: Fix build Disables a patch that is applied on upstream because of new version. --- .../development/haskell-modules/configuration-common.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 50b68dbf924..08364974add 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1323,15 +1323,8 @@ 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 = ""; - })); + jsaddle-warp = dontCheck super.jsaddle-warp; # 2020-06-24: Jailbreaking because of restrictive test dep bounds # Upstream issue: https://github.com/kowainik/trial/issues/62