* GHC apparently works with Perl 5.10 now.
svn path=/nixpkgs/trunk/; revision=15101
This commit is contained in:
parent
902cf75ca6
commit
dae40d9c62
|
@ -1,4 +1,4 @@
|
||||||
{stdenv, fetchurl, perl, libedit, ncurses, gmp, makeWrapper}:
|
{stdenv, fetchurl, perl, libedit, ncurses, gmp}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "6.10.2";
|
version = "6.10.2";
|
||||||
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||||
}
|
}
|
||||||
else throw "cannot bootstrap GHC on this platform";
|
else throw "cannot bootstrap GHC on this platform";
|
||||||
|
|
||||||
buildInputs = [perl makeWrapper];
|
buildInputs = [perl];
|
||||||
|
|
||||||
postUnpack =
|
postUnpack =
|
||||||
# Strip is harmful, see also below. It's important that this happens
|
# Strip is harmful, see also below. It's important that this happens
|
||||||
|
|
|
@ -1868,9 +1868,7 @@ let
|
||||||
});
|
});
|
||||||
|
|
||||||
ghc6103Binary = lowPrio (import ../development/compilers/ghc/6.10.2-binary.nix {
|
ghc6103Binary = lowPrio (import ../development/compilers/ghc/6.10.2-binary.nix {
|
||||||
inherit fetchurl stdenv ncurses gmp libedit makeWrapper;
|
inherit fetchurl stdenv perl ncurses gmp libedit;
|
||||||
# readline = if stdenv.system == "i686-linux" then readline4 else readline;
|
|
||||||
perl = perl58;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
gprolog = import ../development/compilers/gprolog {
|
gprolog = import ../development/compilers/gprolog {
|
||||||
|
|
Loading…
Reference in New Issue