From 1a024eabbcd11356699f15b510c73390d292634c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 3 Jun 2012 18:26:12 +0000
Subject: [PATCH] haskell-packages.nix: Haskell Platform version 2012.2.0.0 is
 out.

Renamed 'haskellPlatformArgs_future' to 'haskellPlatformArgs_2012_2_0_0'.

svn path=/nixpkgs/trunk/; revision=34325
---
 pkgs/top-level/haskell-defaults.nix | 2 +-
 pkgs/top-level/haskell-packages.nix | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 96744b4ee301..37f6d580d304 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -18,7 +18,7 @@
   ghcHEADPrefs = ghc741Prefs;
 
   ghc741Prefs =
-    self : self.haskellPlatformArgs_future self // {
+    self : self.haskellPlatformArgs_2012_2_0_0 self // {
       haskellPlatform = self.haskellPlatform_2012_2_0_0;
       mtl1 = self.mtl_1_1_1_1; # 7.2 ok, 7.3 ok
       binary = null; # now a core package
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 141768b91a7c..04007c229468 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -118,10 +118,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   # NOTE: 2011.4.0.0 is the current default.
 
-  # These are currently set to versions that will likely be in
-  # the next platform release (May 2012). Please update with
-  # care.
-  haskellPlatformArgs_future = self : {
+  haskellPlatformArgs_2012_2_0_0 = self : {
     inherit (self) cabal ghc;
     cgi          = self.cgi_3001_1_7_4;         # 7.4.1 ok
     fgl          = self.fgl_5_4_2_4;            # 7.4.1 ok
@@ -152,10 +149,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     haddock      = self.haddock_2_10_0;         # 7.4.1 ok
   };
 
-  # This is still a prerelease.
   haskellPlatform_2012_2_0_0 =
     callPackage ../development/libraries/haskell/haskell-platform/2012.2.0.0.nix
-      (self.haskellPlatformArgs_future self);
+      (self.haskellPlatformArgs_2012_2_0_0 self);
 
   haskellPlatformArgs_2011_4_0_0 = self : {
     inherit (self) cabal ghc;