Merge remote-tracking branch 'upstream/staging' into master

6 files changed, 0 insertions, 71 deletions

diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index 31cf0b3c8bde..020e4fd30cf7 100644
--- 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
index 5e903822d4bb..98a81b8e59e2 100644
--- 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
deleted file mode 100644
index 129a34ecd86e..000000000000
--- a/pkgs/development/compilers/ghc/ghc-7.x-dont-pass-linker-flags-via-response-files.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs
-index 8c3ab1a..47a2da7 100644
---- a/compiler/main/SysTools.hs
-+++ b/compiler/main/SysTools.hs
-@@ -414,7 +414,7 @@ runCc dflags args =   do
-       args1 = map Option (getOpts dflags opt_c)
-       args2 = args0 ++ args1 ++ args
-   mb_env <- getGccEnv args2
--  runSomethingResponseFile dflags cc_filter "C Compiler" p args2 mb_env
-+  runSomethingFiltered dflags cc_filter "C Compiler" p args2 mb_env
-  where
-   -- discard some harmless warnings from gcc that we can't turn off
-   cc_filter = unlines . doFilter . lines
-@@ -928,7 +928,7 @@ runLink dflags args = do
-       args1     = map Option (getOpts dflags opt_l)
-       args2     = args0 ++ linkargs ++ args1 ++ args
-   mb_env <- getGccEnv args2
--  runSomethingResponseFile dflags ld_filter "Linker" p args2 mb_env
-+  runSomethingFiltered dflags ld_filter "Linker" p args2 mb_env
-   where
-     ld_filter = case (platformOS (targetPlatform dflags)) of
-                   OSSolaris2 -> sunos_ld_filter
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
deleted file mode 100644
index 34e098c8f1ee..000000000000
--- a/pkgs/development/compilers/ghc/ghc-8.x-dont-pass-linker-flags-via-response-files.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ubr ghc-8.0.0.20160411-orig/compiler/main/SysTools.hs ghc-8.0.0.20160411-patched/compiler/main/SysTools.hs
---- ghc-8.0.0.20160411-orig/compiler/main/SysTools.hs	2016-04-12 10:50:46.533389045 +0200
-+++ ghc-8.0.0.20160411-patched/compiler/main/SysTools.hs	2016-04-12 10:53:29.973933760 +0200
-@@ -414,7 +414,7 @@
-       args1 = map Option (getOpts dflags opt_c)
-       args2 = args0 ++ args1 ++ args
-   mb_env <- getGccEnv args2
--  runSomethingResponseFile dflags cc_filter "C Compiler" p args2 mb_env
-+  runSomethingFiltered dflags cc_filter "C Compiler" p args2 mb_env
-  where
-   -- discard some harmless warnings from gcc that we can't turn off
-   cc_filter = unlines . doFilter . lines
-@@ -936,7 +936,7 @@
-       args2     = args0 ++ linkargs ++ args1 ++ args
-       args3     = argFixup args2 []
-   mb_env <- getGccEnv args3
--  runSomethingResponseFile dflags ld_filter "Linker" p args3 mb_env
-+  runSomethingFiltered dflags ld_filter "Linker" p args3 mb_env
-   where
-     testLib lib = "-l" `isPrefixOf` lib || ".a" `isSuffixOf` lib
-     {- GHC is just blindly appending linker arguments from libraries and
-Only in ghc-8.0.0.20160411-patched/compiler/main: SysTools.hs.orig
-Only in ghc-8.0.0.20160411-patched/compiler/main: SysTools.hs.rej
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
deleted file mode 100644
index ebbb9326a829..000000000000
--- a/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ghc/compiler/main/SysTools.hs	2016-11-09 14:03:05.304528147 -0500
-+++ ghc2/compiler/main/SysTools.hs	2016-11-09 14:00:19.712934686 -0500
-@@ -421,7 +421,7 @@
-       args1 = map Option (getOpts dflags opt_c)
-       args2 = args0 ++ args1 ++ args
-   mb_env <- getGccEnv args2
--  runSomethingResponseFile dflags cc_filter "C Compiler" p args2 mb_env
-+  runSomethingFiltered dflags cc_filter "C Compiler" p args2 mb_env
-  where
-   -- discard some harmless warnings from gcc that we can't turn off
-   cc_filter = unlines . doFilter . lines
-@@ -911,7 +911,7 @@
-       args1     = map Option (getOpts dflags opt_l)
-       args2     = args0 ++ linkargs ++ args1 ++ args
-   mb_env <- getGccEnv args2
--  runSomethingResponseFile dflags ld_filter "Linker" p args2 mb_env
-+  runSomethingFiltered dflags ld_filter "Linker" p args2 mb_env
-   where
-     ld_filter = case (platformOS (targetPlatform dflags)) of
-                   OSSolaris2 -> sunos_ld_filter
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index f46a017c66aa..23a1b2821492 100644
--- 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