diff options
author | John Ericson <Ericson2314@yahoo.com> | 2018-06-21 18:07:11 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-21 18:07:11 -0400 |
commit | e050011aa37fa7108fc26389b557adaf3f682319 (patch) | |
tree | dd3a993fb841027dfc639a82b66f6e3a9b2d3be6 /pkgs/development/compilers/ghc | |
parent | ec2ea29716b3b00e21eb317ab5a3fe9d4ef62736 (diff) | |
parent | fd7a6ea0aff44e90b999958c58cc3acc8579ae72 (diff) | |
download | nixlib-e050011aa37fa7108fc26389b557adaf3f682319.tar nixlib-e050011aa37fa7108fc26389b557adaf3f682319.tar.gz nixlib-e050011aa37fa7108fc26389b557adaf3f682319.tar.bz2 nixlib-e050011aa37fa7108fc26389b557adaf3f682319.tar.lz nixlib-e050011aa37fa7108fc26389b557adaf3f682319.tar.xz nixlib-e050011aa37fa7108fc26389b557adaf3f682319.tar.zst nixlib-e050011aa37fa7108fc26389b557adaf3f682319.zip |
Merge pull request #42311 from obsidiansystems/haskell-enable-shared-defaults
haskell: make generic builder follow compiler’s shared config
Diffstat (limited to 'pkgs/development/compilers/ghc')
-rw-r--r-- | pkgs/development/compilers/ghc/7.10.3-binary.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/7.10.3.nix | 1 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.0.2.nix | 1 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.2.1-binary.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.2.2.nix | 1 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.4.3.nix | 1 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 1 |
7 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix index 48e2ca0a585c..53693ff50521 100644 --- a/pkgs/development/compilers/ghc/7.10.3-binary.nix +++ b/pkgs/development/compilers/ghc/7.10.3-binary.nix @@ -153,7 +153,10 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; - passthru = { targetPrefix = ""; }; + passthru = { + targetPrefix = ""; + enableShared = true; + }; meta.license = stdenv.lib.licenses.bsd3; meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux"]; diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index 3dd320e02572..2a906d918aa3 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -177,6 +177,7 @@ stdenv.mkDerivation rec { inherit bootPkgs targetPrefix; inherit llvmPackages; + inherit enableShared; # Our Cabal compiler name haskellCompilerName = "ghc-7.10.3"; diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 53c5a218cb13..8062e93df549 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -183,6 +183,7 @@ stdenv.mkDerivation rec { inherit bootPkgs targetPrefix; inherit llvmPackages; + inherit enableShared; # Our Cabal compiler name haskellCompilerName = "ghc-8.0.2"; diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix index c88d2a8685a6..9bd7dfcb9fc1 100644 --- a/pkgs/development/compilers/ghc/8.2.1-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix @@ -155,7 +155,10 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; - passthru = { targetPrefix = ""; }; + passthru = { + targetPrefix = ""; + enableShared = true; + }; meta.license = stdenv.lib.licenses.bsd3; # AArch64 should work in theory but eventually some builds start segfaulting diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 5f0818a017d1..348e909dbdbe 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -201,6 +201,7 @@ stdenv.mkDerivation rec { inherit bootPkgs targetPrefix; inherit llvmPackages; + inherit enableShared; # Our Cabal compiler name haskellCompilerName = "ghc-8.2.2"; diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index a582bf0859d9..ac3578927bd5 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -195,6 +195,7 @@ stdenv.mkDerivation rec { inherit bootPkgs targetPrefix; inherit llvmPackages; + inherit enableShared; # Our Cabal compiler name haskellCompilerName = "ghc-8.4.3"; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index c128891ec382..8ccd72ef55a2 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -191,6 +191,7 @@ stdenv.mkDerivation rec { inherit bootPkgs targetPrefix; inherit llvmPackages; + inherit enableShared; # Our Cabal compiler name haskellCompilerName = "ghc-8.5"; |