diff options
| author | Luc Tielen <luc.tielen@kabisa.nl> | 2019-09-16 23:52:26 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2019-09-18 19:36:58 +0200 |
| commit | 5ea256fe5fb038327f2c6593eed1d715d69ec4e7 (patch) | |
| tree | cf6fecd11dcd608ab407d1f9d53dc5876024bb5a /pkgs | |
| parent | 6facf5b59400e37caa7bb2003139ad7d05ba5488 (diff) | |
| download | nixpkgs-5ea256fe5fb038327f2c6593eed1d715d69ec4e7.tar nixpkgs-5ea256fe5fb038327f2c6593eed1d715d69ec4e7.tar.gz nixpkgs-5ea256fe5fb038327f2c6593eed1d715d69ec4e7.tar.bz2 nixpkgs-5ea256fe5fb038327f2c6593eed1d715d69ec4e7.tar.lz nixpkgs-5ea256fe5fb038327f2c6593eed1d715d69ec4e7.tar.xz nixpkgs-5ea256fe5fb038327f2c6593eed1d715d69ec4e7.tar.zst nixpkgs-5ea256fe5fb038327f2c6593eed1d715d69ec4e7.zip | |
ghc881 - alex: try only applying relevant patch
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 13 |
1 files changed, 5 insertions, 8 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 2188b8d0091..756ff243aa2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -159,14 +159,11 @@ self: super: { vault = dontHaddock super.vault; # The test suite does not know how to find the 'alex' binary. - alex = overrideCabal (overrideSrc super.alex { - src = pkgs.fetchFromGitHub { - owner = "simonmar"; - repo = "alex"; - rev = "11042dbcc45382c57216eecb1438b625e1cca350"; - sha256 = "03ywnf0mh3fzb636kq8gjz0vs06qg9kqi3lsh0b24wsfw7pppysr"; - }; - }) (drv: { + # TODO dont fetch patch if https://github.com/simonmar/alex/issues/140 is resolved + alex = overrideCabal (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"''; }); |