diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-11 15:18:00 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-14 13:43:01 +0100 |
| commit | 537b746bbd2a17fb0e4c5c4fda3cb93f6d52d9d9 (patch) | |
| tree | 3d747e4d7f21c4ef32fcaac2a1bde04fac29af3b /pkgs/development/compilers/ghc | |
| parent | f0fef4defb266af7fa1f24ad081a2407f62655da (diff) | |
| download | nixlib-537b746bbd2a17fb0e4c5c4fda3cb93f6d52d9d9.tar nixlib-537b746bbd2a17fb0e4c5c4fda3cb93f6d52d9d9.tar.gz nixlib-537b746bbd2a17fb0e4c5c4fda3cb93f6d52d9d9.tar.bz2 nixlib-537b746bbd2a17fb0e4c5c4fda3cb93f6d52d9d9.tar.lz nixlib-537b746bbd2a17fb0e4c5c4fda3cb93f6d52d9d9.tar.xz nixlib-537b746bbd2a17fb0e4c5c4fda3cb93f6d52d9d9.tar.zst nixlib-537b746bbd2a17fb0e4c5c4fda3cb93f6d52d9d9.zip | |
ghc8: apply patches to fix https://ghc.haskell.org/trac/ghc/ticket/12130
Namely: https://git.haskell.org/ghc.git/commitdiff/4d71cc89b4e9648f3fbb29c8fcd25d725616e265 https://git.haskell.org/ghc.git/commitdiff/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd
Diffstat (limited to 'pkgs/development/compilers/ghc')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.0.1.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index fceade0741f9..9e379f06b219 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -1,10 +1,16 @@ { stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils -, hscolour +, hscolour, patchutils }: let inherit (bootPkgs) ghc; + fetchFilteredPatch = args: fetchurl (args // { + downloadToTemp = true; + postFetch = '' + ${patchutils}/bin/filterdiff --clean --strip-match=1 -x 'testsuite/*' "$downloadedFile" > "$out" + ''; + }); in stdenv.mkDerivation rec { version = "8.0.1"; @@ -17,6 +23,10 @@ stdenv.mkDerivation rec { patches = [ ./ghc-8.x-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 + + # Fix https://ghc.haskell.org/trac/ghc/ticket/12130 + (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/4d71cc89b4e9648f3fbb29c8fcd25d725616e265; sha256 = "0syaxb4y4s2dc440qmrggb4vagvqqhb55m6mx12rip4i9qhxl8k0"; }) + (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; }) ]; buildInputs = [ ghc perl hscolour ]; |