diff options
| author | Peter Simons <simons@cryp.to> | 2012-06-03 18:26:12 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-06-03 18:26:12 +0000 |
| commit | 1a024eabbcd11356699f15b510c73390d292634c (patch) | |
| tree | b51c7da452eaf8e84544a8d514919e3d869215be /pkgs/top-level | |
| parent | 7ea86fc8a2fc1a94b31a71519ac4d9f379610e5f (diff) | |
| download | nixlib-1a024eabbcd11356699f15b510c73390d292634c.tar nixlib-1a024eabbcd11356699f15b510c73390d292634c.tar.gz nixlib-1a024eabbcd11356699f15b510c73390d292634c.tar.bz2 nixlib-1a024eabbcd11356699f15b510c73390d292634c.tar.lz nixlib-1a024eabbcd11356699f15b510c73390d292634c.tar.xz nixlib-1a024eabbcd11356699f15b510c73390d292634c.tar.zst nixlib-1a024eabbcd11356699f15b510c73390d292634c.zip | |
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
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/haskell-defaults.nix | 2 | ||||
| -rw-r--r-- | 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; |