* Build GHC 6.8 and 6.10 in Hydra.

* Make GHC 6.10.2 the default.

svn path=/nixpkgs/trunk/; revision=15107
This commit is contained in:
Eelco Dolstra 2009-04-16 22:06:33 +00:00
parent ad07109bba
commit 0df122b0ac
2 changed files with 19 additions and 18 deletions

View File

@ -1832,13 +1832,29 @@ let
inherit ghc;
};
ghc = ghc683;
ghc = ghc6102;
ghc642 = import ../development/compilers/ghc/6.4.2.nix {
inherit fetchurl stdenv perl ncurses readline m4 gmp;
ghc = ghc642Binary;
};
ghc642Binary = lowPrio (import ../development/compilers/ghc/6.4.2-binary.nix {
inherit fetchurl stdenv ncurses gmp;
readline = if stdenv.system == "i686-linux" then readline4 else readline;
perl = perl58;
});
ghc682 = import ../development/compilers/ghc/6.8.2.nix {
inherit fetchurl stdenv readline perl gmp ncurses m4;
ghc = ghc642Binary;
};
ghc661 = import ../development/compilers/ghc/6.6.1.nix {
inherit fetchurl stdenv readline perl58 gmp ncurses m4;
ghc = ghc642Binary;
};
ghc683 = import ../development/compilers/ghc/6.8.3.nix {
inherit fetchurl stdenv readline perl gmp ncurses m4;
ghc = ghc642Binary;
@ -1851,22 +1867,6 @@ let
};
};
ghc661 = import ../development/compilers/ghc/6.6.1.nix {
inherit fetchurl stdenv readline perl58 gmp ncurses m4;
ghc = ghc642Binary;
};
ghc642 = import ../development/compilers/ghc/6.4.2.nix {
inherit fetchurl stdenv perl ncurses readline m4 gmp;
ghc = ghc642Binary;
};
ghc642Binary = lowPrio (import ../development/compilers/ghc/6.4.2-binary.nix {
inherit fetchurl stdenv ncurses gmp;
readline = if stdenv.system == "i686-linux" then readline4 else readline;
perl = perl58;
});
ghc6102 = import ../development/compilers/ghc/6.10.2.nix {
inherit fetchurl stdenv perl ncurses gmp libedit;
ghc = ghc6102Binary;

View File

@ -121,7 +121,8 @@ in {
gcc34 = linux;
gcc43multi = ["x86_64-linux"];
gdb = all;
ghc = ghcSupported;
ghc683 = ghcSupported;
ghc6102 = ghcSupported;
ghostscript = linux;
ghostscriptX = linux;
gimp = linux;