diff options
| author | Peter Simons <simons@cryp.to> | 2017-12-05 09:36:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 09:36:08 +0100 |
| commit | 8d8061ec20e0e41f43d9ff803f1834665ae31963 (patch) | |
| tree | 58601b4fbed9227cc7be7038b03f548113084782 /pkgs/development/compilers/ghc | |
| parent | e5e32822df935484f9baff019f692a0c6812f1c4 (diff) | |
| download | nixlib-8d8061ec20e0e41f43d9ff803f1834665ae31963.tar nixlib-8d8061ec20e0e41f43d9ff803f1834665ae31963.tar.gz nixlib-8d8061ec20e0e41f43d9ff803f1834665ae31963.tar.bz2 nixlib-8d8061ec20e0e41f43d9ff803f1834665ae31963.tar.lz nixlib-8d8061ec20e0e41f43d9ff803f1834665ae31963.tar.xz nixlib-8d8061ec20e0e41f43d9ff803f1834665ae31963.tar.zst nixlib-8d8061ec20e0e41f43d9ff803f1834665ae31963.zip | |
Revert "Revive multiple outputs for Haskell 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.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 |
5 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix index af1db1e6dccf..51274dd60598 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 22a1016776ee..d573a22e0ae8 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.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 55193f2f3c31..d475e3438b4b 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 7c3b21f33c25..bcc801c98ea5 100644 --- a/pkgs/development/compilers/ghc/8.2.1.nix +++ b/pkgs/development/compilers/ghc/8.2.1.nix @@ -10,7 +10,7 @@ let inherit (bootPkgs) ghc; version = "8.2.1"; - preReleaseName = "ghc-8.2.1"; + commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; commonPreConfigure = '' sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 27f706fc1c67..92ba3f6a46ed 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"; |