JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17730 from obadz/ghc8-fix-12130

Browse Source 
ghc8: apply patches to fix https://ghc.haskell.org/trac/ghc/ticket/12130
This commit is contained in:
Peter Simons 2016-08-19 10:15:28 +02:00 committed by GitHub
commit 0c341c206e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/compilers/ghc/8.0.1.nix
View File

@ -1,10 +1,16 @@
{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils { stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
, hscolour , hscolour, patchutils
}: }:
let let
inherit (bootPkgs) ghc; inherit (bootPkgs) ghc;
fetchFilteredPatch = args: fetchurl (args // {
downloadToTemp = true;
postFetch = ''
${patchutils}/bin/filterdiff --clean --strip-match=1 -x 'testsuite/*' "$downloadedFile" > "$out"
'';
});
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "8.0.1"; version = "8.0.1";
@ -17,6 +23,10 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./ghc-8.x-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 ./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 ]; buildInputs = [ ghc perl hscolour ];