ghc: drop patch that disables use of response files

NixOS#11762 has been fixed by NixOS@1ad1edb.
corngood · Nov 20, 2016 · 02668d6 · 02668d6
1 parent 175461e
commit 02668d6
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 71 deletions.
diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
   patches = [
     docFixes
     ./relocation.patch
-    ./ghc-7.x-dont-pass-linker-flags-via-response-files.patch   # https://github.com/NixOS/nixpkgs/issues/10752
   ];
 
   buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ];

diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix
@@ -22,7 +22,6 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    ./ghc-8.x-dont-pass-linker-flags-via-response-files.patch  # https://github.com/NixOS/nixpkgs/issues/10752
     ./relocation.patch
 
     # Fix https://ghc.haskell.org/trac/ghc/ticket/12130

diff --git a/pkgs/development/compilers/ghc/ghc-7.x-dont-pass-linker-flags-via-response-files.patch b/pkgs/development/compilers/ghc/ghc-7.x-dont-pass-linker-flags-via-response-files.patch
diff --git a/pkgs/development/compilers/ghc/ghc-8.x-dont-pass-linker-flags-via-response-files.patch b/pkgs/development/compilers/ghc/ghc-8.x-dont-pass-linker-flags-via-response-files.patch
diff --git a/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch b/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
@@ -27,10 +27,6 @@ in stdenv.mkDerivation (rec {
     sha256 = "1ryggmz961qd0fl50rkjjvi6g9azwla2vx9310a9nzjaj5x6ib4y";
   };
 
-  # This shouldn't be necessary since 1ad1edbb32ce01ba8b47d8e8dad357b0edd6a4dc, but
-  # see http://hydra.cryp.to/build/2061608/nixlog/1/raw
-  patches = [ ./ghc-HEAD-dont-pass-linker-flags-via-response-files.patch ];
-
   postPatch = ''
     echo ${version} >VERSION
     echo ${rev} >GIT_COMMIT_ID