From de051787bff567367ea120539beffc03302edba3 Mon Sep 17 00:00:00 2001 From: Luc Tielen <luc.tielen@kabisa.nl> Date: Tue, 17 Sep 2019 11:02:47 +0200 Subject: [PATCH] ghc881 - alex: simplify override --- .../development/haskell-modules/configuration-ghc-8.8.x.nix | 6 +----- 1 file changed, 1 insertion(+), 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 756ff243aa2..41925d89550 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -158,13 +158,9 @@ self: super: { tls = self.tls_1_5_1; vault = dontHaddock super.vault; - # The test suite does not know how to find the 'alex' binary. # TODO dont fetch patch if https://github.com/simonmar/alex/issues/140 is resolved - alex = overrideCabal (appendPatch super.alex (pkgs.fetchpatch { + alex = appendPatch super.alex (pkgs.fetchpatch { url = "https://github.com/simonmar/alex/commit/deaae6eddef5186bfd0e42e2c3ced39e26afa4d6.patch"; sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5"; - })) (drv: { - testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which]; - preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"''; }); }