diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-16 22:06:33 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-16 22:06:33 +0000 |
| commit | 0df122b0acdc9cf446fff5d005a29b1a3c312571 (patch) | |
| tree | ef9b676ec2977d13dbe4cb9085f6152e60b0d7d7 /pkgs | |
| parent | ad07109bbad859d9d92245ef1b43bb4b612934cd (diff) | |
| download | nixlib-0df122b0acdc9cf446fff5d005a29b1a3c312571.tar nixlib-0df122b0acdc9cf446fff5d005a29b1a3c312571.tar.gz nixlib-0df122b0acdc9cf446fff5d005a29b1a3c312571.tar.bz2 nixlib-0df122b0acdc9cf446fff5d005a29b1a3c312571.tar.lz nixlib-0df122b0acdc9cf446fff5d005a29b1a3c312571.tar.xz nixlib-0df122b0acdc9cf446fff5d005a29b1a3c312571.tar.zst nixlib-0df122b0acdc9cf446fff5d005a29b1a3c312571.zip | |
* Build GHC 6.8 and 6.10 in Hydra.
* Make GHC 6.10.2 the default. svn path=/nixpkgs/trunk/; revision=15107
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 34 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 3 |
2 files changed, 19 insertions, 18 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf64a4a60ff2..51d128f63b3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 3fae71484ce1..3e0b1387d089 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -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; |