diff options
| author | Luc Tielen <luc.tielen@kabisa.nl> | 2019-09-16 22:11:40 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2019-09-18 19:36:58 +0200 |
| commit | 4ea67e42c41800034159f134c547780bac0f2a78 (patch) | |
| tree | f2ef70268bcab0721d0de93259336f054701f344 /pkgs | |
| parent | b55447925deb439c5ec16d0ee072379346ad0379 (diff) | |
| download | nixpkgs-4ea67e42c41800034159f134c547780bac0f2a78.tar nixpkgs-4ea67e42c41800034159f134c547780bac0f2a78.tar.gz nixpkgs-4ea67e42c41800034159f134c547780bac0f2a78.tar.bz2 nixpkgs-4ea67e42c41800034159f134c547780bac0f2a78.tar.lz nixpkgs-4ea67e42c41800034159f134c547780bac0f2a78.tar.xz nixpkgs-4ea67e42c41800034159f134c547780bac0f2a78.tar.zst nixpkgs-4ea67e42c41800034159f134c547780bac0f2a78.zip | |
Only patch alex for ghc881
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 12c6d1bcbfd..a3cffdb8a1d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1005,7 +1005,7 @@ self: super: { spdx = dontCheck super.spdx; # The test suite does not know how to find the 'alex' binary. - alex = overrideCabal (appendPatch super.alex ./patches/alex-3.2.4-ghc8.8.x.patch) (drv: { + alex = overrideCabal super.alex (drv: { testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which]; preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"''; }); 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 a5c84898ab4..063452b053f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -161,4 +161,11 @@ 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 remove patch when alex gets a newer release than 3.2.4 + alex = overrideCabal (appendPatch super.alex ./patches/alex-3.2.4-ghc8.8.x.patch) (drv: { + testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which]; + preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"''; + }); } |