diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-09 15:46:00 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-09 15:46:00 +0200 |
| commit | 74c24385cb2864f937031df74af14fc8060e1540 (patch) | |
| tree | 5524856cfa11a449f4bef972fbc994bec6ff44cf /pkgs/development/compilers | |
| parent | 5c8472a2a17625855d0811ebb5709c9aa84fdd3f (diff) | |
| parent | f0e38f7b3810b0f06bbe6908158fcb247d0e2dd3 (diff) | |
| download | nixlib-74c24385cb2864f937031df74af14fc8060e1540.tar nixlib-74c24385cb2864f937031df74af14fc8060e1540.tar.gz nixlib-74c24385cb2864f937031df74af14fc8060e1540.tar.bz2 nixlib-74c24385cb2864f937031df74af14fc8060e1540.tar.lz nixlib-74c24385cb2864f937031df74af14fc8060e1540.tar.xz nixlib-74c24385cb2864f937031df74af14fc8060e1540.tar.zst nixlib-74c24385cb2864f937031df74af14fc8060e1540.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.2.2.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.4.4.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.6.4.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.6.5.nix | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index b9099699b024..9b942da25a63 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -231,6 +231,10 @@ stdenv.mkDerivation (rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + # See #63511 - the only unstripped file is the debug rts which isn't meant to + # be stripped. + dontStrip = true; + checkTarget = "test"; doCheck = false; # fails with "testsuite/tests: No such file or directory. Stop." diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index 50f6905e5b7c..a355f57a5c76 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -208,6 +208,10 @@ stdenv.mkDerivation (rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + # See #63511 - the only unstripped file is the debug rts which isn't meant to + # be stripped. + dontStrip = true; + checkTarget = "test"; hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix index 5feb0a2032cf..ff9ef0a5c38a 100644 --- a/pkgs/development/compilers/ghc/8.6.4.nix +++ b/pkgs/development/compilers/ghc/8.6.4.nix @@ -207,6 +207,10 @@ stdenv.mkDerivation (rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + # See #63511 - the only unstripped file is the debug rts which isn't meant to + # be stripped. + dontStrip = true; + checkTarget = "test"; hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index d84f2cca059e..44ad6da2ff51 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -207,6 +207,10 @@ stdenv.mkDerivation (rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + # See #63511 - the only unstripped file is the debug rts which isn't meant to + # be stripped. + dontStrip = true; + checkTarget = "test"; hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; |