diff options
| author | Domen Kožar <domen@dev.si> | 2016-11-10 14:16:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-10 14:16:29 +0100 |
| commit | 1b773f5e423963bf289752e58b6a87ce75320818 (patch) | |
| tree | 17bff8453887b7921099a085b804ceb3a94a434c /pkgs/development | |
| parent | 178c3231470f02a0e2be6fcbde425e065c9cc146 (diff) | |
| parent | bac11893993088ade3bce7cbafe21c6dd82c27a5 (diff) | |
| download | nixlib-1b773f5e423963bf289752e58b6a87ce75320818.tar nixlib-1b773f5e423963bf289752e58b6a87ce75320818.tar.gz nixlib-1b773f5e423963bf289752e58b6a87ce75320818.tar.bz2 nixlib-1b773f5e423963bf289752e58b6a87ce75320818.tar.lz nixlib-1b773f5e423963bf289752e58b6a87ce75320818.tar.xz nixlib-1b773f5e423963bf289752e58b6a87ce75320818.tar.zst nixlib-1b773f5e423963bf289752e58b6a87ce75320818.zip | |
Merge pull request #20288 from danharaj/ghcHEAD-fix-patchPhase
haskell.compiler.ghcHEAD: fix patchPhase #10752
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch | 20 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 6 |
2 files changed, 23 insertions, 3 deletions
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 new file mode 100644 index 000000000000..ebbb9326a829 --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch @@ -0,0 +1,20 @@ +--- 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 31c66f175841..d57b6e575da5 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -6,18 +6,18 @@ let inherit (bootPkgs) ghc; in stdenv.mkDerivation rec { - version = "8.1.20161108"; + version = "8.1.20161109"; name = "ghc-${version}"; rev = "2e8463b232054b788b73e6551947a9434aa76009"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "1x1vnb2zr2qrak72bdqh65d00q351yhn8xvv5i4i359cf2xjmgfd"; + sha256 = "12nxai5qqnw42syhd0vzl2f9f8z28rc0fsa7g771dyzpqglak90l"; }; patches = [ - ./ghc-8.x-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 + ./ghc-HEAD-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 ]; postUnpack = '' |