From 02668d6c6a8e5492be4339d715da570de9fae8f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 8 Nov 2016 16:01:49 +0100 Subject: ghc: drop patch that disables use of response files https://github.com/NixOS/nixpkgs/issues/11762 has been fixed by https://github.com/NixOS/nixpkgs/commit/1ad1edbb32ce01ba8b47d8e8dad357b0edd6a4dc. --- pkgs/development/compilers/ghc/7.10.3.nix | 1 - pkgs/development/compilers/ghc/8.0.1.nix | 1 - ...dont-pass-linker-flags-via-response-files.patch | 22 --------------------- ...dont-pass-linker-flags-via-response-files.patch | 23 ---------------------- ...dont-pass-linker-flags-via-response-files.patch | 20 ------------------- pkgs/development/compilers/ghc/head.nix | 4 ---- 6 files changed, 71 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/ghc-7.x-dont-pass-linker-flags-via-response-files.patch delete mode 100644 pkgs/development/compilers/ghc/ghc-8.x-dont-pass-linker-flags-via-response-files.patch delete mode 100644 pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch (limited to 'pkgs/development/compilers') 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 d95791353ae3..aec6faed585e 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 -- cgit 1.4.1 From 7ab6edd171ad8b00d868e6475c70415915d486d0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 16:05:53 +0100 Subject: llvm_34: use python2 --- pkgs/development/compilers/llvm/3.4/lld.nix | 4 ++-- pkgs/development/compilers/llvm/3.4/lldb.nix | 4 ++-- pkgs/development/compilers/llvm/3.4/llvm.nix | 4 ++-- pkgs/development/compilers/llvm/3.4/polly.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/llvm/3.4/lld.nix b/pkgs/development/compilers/llvm/3.4/lld.nix index c502b0e215e5..c1841610f314 100644 --- a/pkgs/development/compilers/llvm/3.4/lld.nix +++ b/pkgs/development/compilers/llvm/3.4/lld.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, llvm, ncurses, zlib, python, version }: +{ stdenv, fetch, cmake, llvm, ncurses, zlib, python2, version }: stdenv.mkDerivation { name = "lld-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { export cmakeFlags="$cmakeFlags -DLLD_PATH_TO_LLVM_SOURCE="`ls -d $PWD/llvm-*` ''; - buildInputs = [ cmake ncurses zlib python ]; + buildInputs = [ cmake ncurses zlib python2 ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/development/compilers/llvm/3.4/lldb.nix b/pkgs/development/compilers/llvm/3.4/lldb.nix index cd498b5cf519..5d2e9c479abe 100644 --- a/pkgs/development/compilers/llvm/3.4/lldb.nix +++ b/pkgs/development/compilers/llvm/3.4/lldb.nix @@ -8,7 +8,7 @@ , libedit , llvm , clang -, python +, python2 , version }: @@ -23,7 +23,7 @@ stdenv.mkDerivation { scripts/Python/build-swig-Python.sh ''; - buildInputs = [ cmake python which swig ncurses zlib libedit ]; + buildInputs = [ cmake python2 which swig ncurses zlib libedit ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 7471974d00a1..54346baba0d4 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -3,7 +3,7 @@ , perl , groff , cmake -, python +, python2 , libffi , binutils , libxml2 @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { buildInputs = [ perl groff cmake libxml2 libffi ] - ++ stdenv.lib.optional (!stdenv.isDarwin) python /* + ++ stdenv.lib.optional (!stdenv.isDarwin) python2 /* ++ stdenv.lib.optional stdenv.isLinux valgrind */; propagatedBuildInputs = [ ncurses zlib ]; diff --git a/pkgs/development/compilers/llvm/3.4/polly.nix b/pkgs/development/compilers/llvm/3.4/polly.nix index 2fed0fc8abed..3d3483afafaa 100644 --- a/pkgs/development/compilers/llvm/3.4/polly.nix +++ b/pkgs/development/compilers/llvm/3.4/polly.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, isl, python, gmp, llvm, version }: +{ stdenv, fetch, cmake, isl, python2, gmp, llvm, version }: stdenv.mkDerivation { name = "polly-${version}"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { patches = [ ./polly-separate-build.patch ]; - buildInputs = [ cmake isl python gmp ]; + buildInputs = [ cmake isl python2 gmp ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" -- cgit 1.4.1