Update default Haskell environment to Haskell Platform 2012.4.0.0.

The most significant change brought by this update is that we now use
GHC version 7.4.2 by default.
This commit is contained in:
Peter Simons 2012-11-06 18:07:38 +01:00
parent 7bb8c6ac8f
commit ce2e93a236
2 changed files with 8 additions and 18 deletions

View file

@ -2319,9 +2319,9 @@ let
# particularly in connection with Hydra builds for all these packages.
# So we enable it for selected versions only.
# Current default version: 7.4.1.
haskellPackages = haskellPackages_ghc741;
# Current Haskell platform.
# Current default version: 7.4.2.
haskellPackages = haskellPackages_ghc742;
# Current Haskell Platform: 2012.4.0.0
haskellPlatform = haskellPackages.haskellPlatform;
haskellPackages_ghc6104 = recurseIntoAttrs (haskell.packages_ghc6104);
@ -2338,11 +2338,10 @@ let
# The following three lines achieve that: the first two make Hydra build explicit
# profiling and non-profiling versions; the final respects the user-configured
# default setting.
haskellPackages_ghc741_no_profiling = recurseIntoAttrs (haskell.packages_ghc741.noProfiling);
haskellPackages_ghc741_profiling = recurseIntoAttrs (haskell.packages_ghc741.profiling);
haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741.highPrio);
haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742);
haskellPackages_ghc742_pedantic = haskell.packages_ghc742_pedantic;
haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741);
haskellPackages_ghc742_no_profiling = recurseIntoAttrs (haskell.packages_ghc741.noProfiling);
haskellPackages_ghc742_profiling = recurseIntoAttrs (haskell.packages_ghc741.profiling);
haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742.highPrio);
haskellPackages_ghc761 = recurseIntoAttrs (haskell.packages_ghc761);
# Reasonably current HEAD snapshot.
haskellPackages_ghcHEAD = haskell.packages_ghcHEAD;

View file

@ -22,18 +22,12 @@
extensibleExceptions = self.extensibleExceptions_0_1_1_4;
};
ghc742Prefs_pedantic =
ghc742Prefs =
self : self.haskellPlatformArgs_2012_4_0_0 self // {
haskellPlatform = self.haskellPlatform_2012_4_0_0;
binary = null; # now a core package
};
# until the Haskell Platform for 7.4.2 is released, this works fine/better;
# mainly because the Haskell Platform 2012.4.0.0 release candidate mandates
# vector 0.10 and primitive 0.5, which at this time aren't supported widely
# by other packages
ghc742Prefs = ghc741Prefs;
ghc741Prefs =
self : self.haskellPlatformArgs_2012_2_0_0 self // {
haskellPlatform = self.haskellPlatform_2012_2_0_0;
@ -273,9 +267,6 @@
prefFun = ghc742Prefs;
};
packages_ghc742_pedantic =
packages_ghc742.override { prefFun = ghc742Prefs_pedantic; };
packages_ghc761 =
packages { ghcPath = ../development/compilers/ghc/7.6.1.nix;
ghcBinary = ghc704Binary;