From 64c5eda3176629c797a96e2a41069c786fc6df1a Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 18 Nov 2019 17:04:41 +0100 Subject: [PATCH] alex: drop patch simonmar/alex#140 was merged and the patch has been applied in alex version 3.2.5 so the build is broken trying to re-apply the patch. --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 5c54a90ce7e7..ec0e4377f764 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -102,11 +102,6 @@ self: super: { vault = dontHaddock super.vault; monad-par = dontCheck super.monad-par; # test suite does not compile in monad-par-0.3.4.8 - # TODO dont fetch patch if https://github.com/simonmar/alex/issues/140 is resolved - alex = appendPatch super.alex (pkgs.fetchpatch { - url = "https://github.com/simonmar/alex/commit/deaae6eddef5186bfd0e42e2c3ced39e26afa4d6.patch"; - sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5"; - }); # https://github.com/snapframework/snap-core/issues/288 snap-core = overrideCabal super.snap-core (drv: { prePatch = "substituteInPlace src/Snap/Internal/Core.hs --replace 'fail = Fail.fail' ''"; }); # needs a release