Switched the default version of ghc and Haskell Platform to 6.12.3 and 2010.2.0.0.

svn path=/nixpkgs/trunk/; revision=22715

5 files changed, 27 insertions, 19 deletions

diff --git a/pkgs/development/libraries/haskell/haskell-platform/default.nix b/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix
index 87b5173620c..87b5173620c 100644
--- a/pkgs/development/libraries/haskell/haskell-platform/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix
diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix
index ce74a0812d3..012c98f6887 100644
--- a/pkgs/tools/typesetting/lhs2tex/default.nix
+++ b/pkgs/tools/typesetting/lhs2tex/default.nix
@@ -1,13 +1,13 @@
-{cabal, tetex, polytable, regexCompat, utf8String}:
+{cabal, tetex, polytable, regexCompat}:
 
 #assert tetex == polytable.tetex;
 
 cabal.mkDerivation (self : {
   pname = "lhs2tex";
-  version = "1.15";
+  version = "1.16";
   name = self.fname;
-  sha256 = "77f25c1f22823587ceca6eead133a403540319a0ae3bf03a369b3e8c86baf124";
-  extraBuildInputs = [tetex regexCompat utf8String];
+  sha256 = "aa43ec92e8d7c94213365a7211d605314476977155e36420caa3cfb394f7c76f";
+  extraBuildInputs = [tetex regexCompat];
   propagatedBuildInputs = [polytable]; # automatically in user-env now with cabal
 
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 251416f3da4..9b25f8a1b68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2387,7 +2387,7 @@ let
   # packages.
 
   # This should point to the current default version.
-  haskellPackages = haskellPackages_ghc6104;
+  haskellPackages = haskellPackages_ghc6123;
 
   # Old versions of ghc that currently don't build because the binary
   # is broken.
@@ -2472,15 +2472,14 @@ let
   haskellPackages_ghc6104 =
     haskellPackagesFun610 ../development/compilers/ghc/6.10.4.nix false;
 
-  # We will soon switch to ghc-6.12.* as default.
-  haskellPackages_ghc6121 = lowPrio
-    (haskellPackagesFun612 ../development/compilers/ghc/6.12.1.nix false);
+  haskellPackages_ghc6121 =
+    haskellPackagesFun612 ../development/compilers/ghc/6.12.1.nix false;
 
-  haskellPackages_ghc6122 = lowPrio
-    (haskellPackagesFun612 ../development/compilers/ghc/6.12.2.nix false);
+  haskellPackages_ghc6122 =
+    haskellPackagesFun612 ../development/compilers/ghc/6.12.2.nix false;
 
-  haskellPackages_ghc6123 = lowPrio
-    (haskellPackagesFun612 ../development/compilers/ghc/6.12.3.nix false);
+  haskellPackages_ghc6123 =
+    haskellPackagesFun612 ../development/compilers/ghc/6.12.3.nix false;
 
   # Currently not pointing to the actual HEAD, therefore disabled
   /*
@@ -7672,7 +7671,7 @@ let
     inherit (gtkLibs) gtk glib;
   };
 
-  darcs = haskellPackages_ghc6104.darcs;
+  darcs = haskellPackages.darcs;
 
   dia = import ../applications/graphics/dia {
     inherit stdenv fetchurl pkgconfig perl perlXMLParser
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5b94cf098c6..819f7ee1416 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -341,7 +341,9 @@ rec {
     inherit cabal haskellSrcExts;
   };
 
-  haskellPlatform2010200 = pkgs.lowPrio (import ../development/libraries/haskell/haskell-platform/2010.2.0.0.nix {
+  haskellPlatform = haskellPlatform2010200;
+
+  haskellPlatform2010200 = import ../development/libraries/haskell/haskell-platform/2010.2.0.0.nix {
     inherit cabal ghc
       html xhtml;
     haskellSrc = haskellSrcP;
@@ -364,7 +366,7 @@ rec {
     haddock = haddock272P;
     happy = happy1185;
     inherit (pkgs) fetchurl;
-  });
+  };
 
   haskellPlatform2010100 = pkgs.lowPrio (import ../development/libraries/haskell/haskell-platform/2010.1.0.0.nix {
     inherit cabal ghc fgl
@@ -389,7 +391,7 @@ rec {
     inherit (pkgs) fetchurl;
   });
 
-  haskellPlatform = import ../development/libraries/haskell/haskell-platform {
+  haskellPlatform2009202 = import ../development/libraries/haskell/haskell-platform/2009.2.0.2.nix {
     inherit cabal ghc GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline
       haskellSrc html parallel regexBase regexCompat regexPosix
       stm time xhtml zlib cabalInstall alex happy haddock;
@@ -1160,7 +1162,7 @@ rec {
   };
 
   lhs2tex = import ../tools/typesetting/lhs2tex {
-    inherit cabal regexCompat utf8String;
+    inherit cabal regexCompat;
     inherit (pkgs) tetex polytable;
   };
 
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 968968bfec4..bebf8283dd8 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -412,12 +412,11 @@ with (import ./release-lib.nix);
   haskellPackages_ghc6104 = {
     darcs = ghcSupported;
     ghc = ghcSupported;
+    gitit = linux;
     gtk2hs = linux;
     leksah = linux;
-    lhs2tex = ghcSupported;
     haskellPlatform = ghcSupported;
     xmonad = linux;
-    gitit = linux;
   };
 
   haskellPackages_ghc6121 = {
@@ -432,6 +431,14 @@ with (import ./release-lib.nix);
     haskellPlatform2010100 = ghcSupported;
   };
 
+  haskellPackages_ghc6123 = {
+    darcs = ghcSupported;
+    ghc = ghcSupported;
+    haskellPlatform2010200 = ghcSupported;
+    lhs2tex = ghcSupported;
+    xmonad = linux;
+  };
+
   kde3 = {
     kdebase = linux;
     kdelibs = linux;