diff options
author | Peter Simons <simons@cryp.to> | 2017-09-06 09:40:01 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2017-09-06 10:19:18 +0200 |
commit | 89f5d52cf44baec14a7f542a605243777b16e7a5 (patch) | |
tree | 64018c5ac3fa02da278b0dcba3983d0d327013e9 /pkgs/development/compilers/ghc | |
parent | f2a76b6c292866e887684a2e7cf0b1e75ffb80cf (diff) | |
download | nixlib-89f5d52cf44baec14a7f542a605243777b16e7a5.tar nixlib-89f5d52cf44baec14a7f542a605243777b16e7a5.tar.gz nixlib-89f5d52cf44baec14a7f542a605243777b16e7a5.tar.bz2 nixlib-89f5d52cf44baec14a7f542a605243777b16e7a5.tar.lz nixlib-89f5d52cf44baec14a7f542a605243777b16e7a5.tar.xz nixlib-89f5d52cf44baec14a7f542a605243777b16e7a5.tar.zst nixlib-89f5d52cf44baec14a7f542a605243777b16e7a5.zip |
Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out"
This reverts commit dfb0f254844150d05d34150a975e6479b883d409, reversing changes made to 7f8ff024372f985e96b438fa5591d9b43fc6e7bd. These changes broke the ghcWithPackages wrapper: nix-shell -p "haskellPackages.ghcWithPackages (ps: [ps.mtl])" --run "ghc-pkg list mtl" /nix/store/szz84j5k1dy3jdashis6ws28d8l8zxxb-ghc-8.0.2-with-packages/lib/ghc-8.0.2/package.conf.d (no packages)
Diffstat (limited to 'pkgs/development/compilers/ghc')
-rw-r--r-- | pkgs/development/compilers/ghc/7.10.2.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/7.10.3.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.0.1.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.0.2.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.2.1.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix index 726fad77865f..863f904e4e96 100644 --- a/pkgs/development/compilers/ghc/7.10.2.nix +++ b/pkgs/development/compilers/ghc/7.10.2.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { sha256 = "1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal"; }; - buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 (stdenv.lib.getBin hscolour) ]; + buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; patches = [ ./relocation.patch ]; diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index 943bc8b124b2..eb8f1dddd19b 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ./relocation.patch ]; - buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 (stdenv.lib.getBin hscolour) ]; + buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index 8e800b78d661..6e47ee92630a 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; }) ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch; - buildInputs = [ ghc perl (stdenv.lib.getBin hscolour) sphinx]; + buildInputs = [ ghc perl hscolour sphinx]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 85aca075d863..e50a8df7352d 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch; - buildInputs = [ ghc perl (stdenv.lib.getBin hscolour) sphinx ]; + buildInputs = [ ghc perl hscolour sphinx ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ghc/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix index 5b76e9ebea76..bce51f92c0bc 100644 --- a/pkgs/development/compilers/ghc/8.2.1.nix +++ b/pkgs/development/compilers/ghc/8.2.1.nix @@ -11,7 +11,7 @@ let inherit (bootPkgs) ghc; version = "8.2.1"; preReleaseName = "ghc-8.2.1"; - commonBuildInputs = [ (stdenv.lib.getBin alex) autoconf automake ghc (stdenv.lib.getBin happy) (stdenv.lib.getBin hscolour) perl python3 sphinx ]; + commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; commonPreConfigure = '' sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 491c014d26d4..362b4895b7e3 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -11,7 +11,7 @@ let inherit (bootPkgs) ghc; - commonBuildInputs = [ ghc perl autoconf automake (stdenv.lib.getBin happy) (stdenv.lib.getBin alex) python3 ]; + commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; rev = "14457cf6a50f708eecece8f286f08687791d51f7"; |