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

ghc: revert "propagate 'gmp' and 'ncurses' to ensure users can link the 'haskeline' library, etc."

Browse Source 
I thought that [1] could be fixed by ensuring that ncurses is available in the
environment (because ghc exports it as a propagateBuildInput), and indeed that
change fixed *some* build failures we've had before. However, the same error
still occurs with other packages, like hledger [2] and Agda [3]. Frankly, I
have no idea why those packages fail and others don't. But clearly the fix was
inadequate, so I'm reverting commit a8076c76.

[1] https://github.com/NixOS/nixpkgs/issues/5616
[2] http://hydra.cryp.to/build/372451/nixlog/1/raw
[2] http://hydra.cryp.to/build/373161/nixlog/1/raw
This commit is contained in:
Peter Simons 2015-01-14 22:16:44 +01:00
parent 26e275398e
commit df76eb1268
19 changed files with 23 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/ghc/6.12.1.nix
View File

@ -10,8 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0ajm4sypk4zgjp0m6i03fadyv5dm9vlqfnvsx1g94yk7vnd9zyfd";
};
buildInputs = [ ghc perl ];
propagatedBuildInputs = [ gmp ncurses ];
buildInputs = [ghc perl gmp ncurses];
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

3
pkgs/development/compilers/ghc/6.12.2.nix
View File

@ -10,8 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "7f1e39f0b3ddaca35b55cd430ca058d1c4678445a7177391c9cb6342b7c41a30";
};
buildInputs = [ ghc perl ];
propagatedBuildInputs = [ gmp ncurses ];
buildInputs = [ghc perl gmp ncurses];
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

3
pkgs/development/compilers/ghc/6.12.3.nix
View File

@ -10,8 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0s2y1sv2nq1cgliv735q2w3gg4ykv1c0g1adbv8wgwhia10vxgbc";
};
buildInputs = [ ghc perl ];
propagatedBuildInputs = [ gmp ncurses ];
buildInputs = [ghc perl gmp ncurses];
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

3
pkgs/development/compilers/ghc/7.0.1.nix
View File

@ -10,8 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1iciljngxmqy465cw3pkl6jp0ydiils4bfz6ixfaxk7aqv7r7xsi";
};
buildInputs = [ ghc perl ];
propagatedBuildInputs = [ gmp ncurses ];
buildInputs = [ghc perl gmp ncurses];
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

3
pkgs/development/compilers/ghc/7.0.2.nix
View File

@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "f0551f1af2f008a8a14a888b70c0557e00dd04f9ae309ac91897306cd04a6668";
};
buildInputs = [ ghc perl ];
propagatedBuildInputs = [ gmp ncurses ];
buildInputs = [ ghc perl gmp ncurses ];
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

3
pkgs/development/compilers/ghc/7.0.3.nix
View File

@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1nfc2c6bdcdfg3f3d9q5v109jrrwhz6by3qa4qi7k0xbip16jq8m";
};
buildInputs = [ ghc perl ];
propagatedBuildInputs = [ gmp ncurses ];
buildInputs = [ ghc perl gmp ncurses ];
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

3
pkgs/development/compilers/ghc/7.0.4.nix
View File

@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1a9b78d9d66c9c21de6c0932e36bb87406a4856f1611bf83bd44539bdc6ed0ed";
};
buildInputs = [ ghc perl ];
propagatedBuildInputs = [ gmp ncurses ];
buildInputs = [ ghc perl gmp ncurses ];
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

3
pkgs/development/compilers/ghc/7.2.1.nix
View File

@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "099w2bvx07jq4b1k8f1hspri30wbk35dz6ilsivxr2xg661c2qjm";
};
buildInputs = [ ghc perl ];
propagatedBuildInputs = [ gmp ncurses ];
buildInputs = [ ghc perl gmp ncurses ];
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

3
pkgs/development/compilers/ghc/7.2.2.nix
View File

@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0g87d3z9275dniaqzkf56qfgzp1msd89nqqhhm2gkc6iga072spz";
};
buildInputs = [ ghc perl ];
propagatedBuildInputs = [ gmp ncurses ];
buildInputs = [ ghc perl gmp ncurses ];
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

3
pkgs/development/compilers/ghc/7.4.1.nix
View File

@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0ycscsagyy9n796a59q6761s6ar50d8inibvnrcp96siksj0j73j";
};
buildInputs = [ ghc perl ];
propagatedBuildInputs = [ gmp ncurses ];
buildInputs = [ ghc perl gmp ncurses ];
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

4
pkgs/development/compilers/ghc/7.4.2.nix
View File

@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "0vc3zmxqi4gflssmj35n5c8idbvyrhd88abi50whbirwlf4i5vpj";
};
buildInputs = [ ghc perl ];
propagatedBuildInputs = [ gmp ncurses ];
buildInputs = [ ghc perl gmp ncurses ];
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

3
pkgs/development/compilers/ghc/7.6.1.nix
View File

@ -10,8 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1q5rqp8z90mq6ysf7h28zkbhfaxlrpva2qy0wnkr43d7214dzp7i";
};
buildInputs = [ ghc perl ];
propagatedBuildInputs = [ gmp ncurses ];
buildInputs = [ ghc perl gmp ncurses ];
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

4
pkgs/development/compilers/ghc/7.6.2.nix
View File

@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "d5f45184abeacf7e9c6b4f63c7101a5c1d7b4fe9007901159e2287ecf38de533";
};
buildInputs = [ ghc perl ];
propagatedBuildInputs = [ gmp ncurses ];
buildInputs = [ ghc perl gmp ncurses ];
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

3
pkgs/development/compilers/ghc/7.6.3.nix
View File

@ -17,8 +17,7 @@ in stdenv.mkDerivation rec {
sha256 = "1669m8k9q72rpd2mzs0bh2q6lcwqiwd1ax3vrard1dgn64yq4hxx";
};
buildInputs = [ ghc perl ];
propagatedBuildInputs = [ gmp ncurses ];
buildInputs = [ ghc perl gmp ncurses ];
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

3
pkgs/development/compilers/ghc/7.8.4.nix
View File

@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1i4254akbb4ym437rf469gc0m40bxm31blp6s1z1g15jmnacs6f3";
};
buildInputs = [ ghc perl ];
propagatedBuildInputs = [ gmp ncurses ];
buildInputs = [ ghc perl gmp ncurses ];
enableParallelBuilding = true;

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

@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0nncvvwksqqz1d991jbag3b4174i275nn0psadriq5hi3px11dkl";
};
buildInputs = [ ghc perl happy alex ];
propagatedBuildInputs = [ gmp ncurses ];
buildInputs = [ ghc perl ncurses happy alex ];
preConfigure = ''
echo >mk/build.mk "DYNAMIC_BY_DEFAULT = NO"

4
pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
View File

@ -16,7 +16,7 @@ self: super: {
directory = null;
filepath = null;
ghc-prim = null;
haskeline = null;
haskeline = self.haskeline_0_7_1_3; # GHC's version is broken: https://github.com/NixOS/nixpkgs/issues/5616.
haskell2010 = null;
haskell98 = null;
hoopl = null;
@ -28,7 +28,7 @@ self: super: {
process = null;
rts = null;
template-haskell = null;
terminfo = null;
terminfo = self.terminfo_0_4_0_0; # GHC's version is broken: https://github.com/NixOS/nixpkgs/issues/5616.
time = null;
unix = null;

4
pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
View File

@ -16,7 +16,7 @@ self: super: {
directory = null;
filepath = null;
ghc-prim = null;
haskeline = null;
haskeline = self.haskeline_0_7_1_3; # GHC's version is broken: https://github.com/NixOS/nixpkgs/issues/5616.
haskell2010 = null;
haskell98 = null;
hoopl = null;
@ -28,7 +28,7 @@ self: super: {
process = null;
rts = null;
template-haskell = null;
terminfo = null;
terminfo = self.terminfo_0_4_0_0; # GHC's version is broken: https://github.com/NixOS/nixpkgs/issues/5616.
time = null;
transformers = null;
unix = null;

2
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -129,7 +129,7 @@ stdenv.mkDerivation ({
mkdir -p $packageConfDir
local inputClosure=""
for i in $propagatedNativeBuildInputs $nativeBuildInputs ${ghc}; do
for i in $propagatedNativeBuildInputs $nativeBuildInputs; do
findInputs $i inputClosure propagated-native-build-inputs
done
for p in $inputClosure; do