public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32112 from nc6/hask-split-out

Browse Source 
Revive multiple outputs for Haskell packages.
This commit is contained in:
Peter Simons
2017-12-04 12:36:45 +01:00
committed by GitHub
parent f1e16171bd dc0e594451
commit 7993e8790f
14 changed files with 172 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/ghc/7.10.2.nix
View File

@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
sha256 = "1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal";
};
buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ];
buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 (stdenv.lib.getBin hscolour) ];
patches = [ ./relocation.patch ];

2
pkgs/development/compilers/ghc/7.10.3.nix
View File

@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
./relocation.patch
];
buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ];
buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 (stdenv.lib.getBin hscolour) ];
enableParallelBuilding = true;

2
pkgs/development/compilers/ghc/8.0.2.nix
View File

@@ -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 hscolour sphinx ];
buildInputs = [ ghc perl (stdenv.lib.getBin hscolour) sphinx ];
enableParallelBuilding = true;

2
pkgs/development/compilers/ghc/8.2.1.nix
View File

@@ -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

2
pkgs/development/compilers/ghc/head.nix
View File

@@ -11,7 +11,7 @@
let
inherit (bootPkgs) ghc;
commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
commonBuildInputs = [ ghc perl autoconf automake (stdenv.lib.getBin happy) (stdenv.lib.getBin alex) python3 ];
rev = "14457cf6a50f708eecece8f286f08687791d51f7";