diff options
| author | Andres Löh <mail@andres-loeh.de> | 2012-05-20 21:04:52 +0000 |
|---|---|---|
| committer | Andres Löh <mail@andres-loeh.de> | 2012-05-20 21:04:52 +0000 |
| commit | 0542d359002a5b6d3564aef485027168ac2cf44f (patch) | |
| tree | 4bdee276155b75ffcec75c0549b76ecdd3bf429a /pkgs/top-level | |
| parent | 513b42ef2b1ce0789da7d278a9d9225d7059e63e (diff) | |
| download | nixlib-0542d359002a5b6d3564aef485027168ac2cf44f.tar nixlib-0542d359002a5b6d3564aef485027168ac2cf44f.tar.gz nixlib-0542d359002a5b6d3564aef485027168ac2cf44f.tar.bz2 nixlib-0542d359002a5b6d3564aef485027168ac2cf44f.tar.lz nixlib-0542d359002a5b6d3564aef485027168ac2cf44f.tar.xz nixlib-0542d359002a5b6d3564aef485027168ac2cf44f.tar.zst nixlib-0542d359002a5b6d3564aef485027168ac2cf44f.zip | |
Added prerelease version of haskell-platform-2012.2.0.0
svn path=/nixpkgs/trunk/; revision=34191
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/haskell-defaults.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 93bc6838eca5..226fe64d91dd 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -19,6 +19,7 @@ ghc741Prefs_pedantic = self : self.haskellPlatformArgs_future 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 627c40ea8343..96f23ac57406 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -139,7 +139,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexPosix = self.regexPosix_0_95_1; # 7.4.1 ok stm = self.stm_2_3; # 7.4.1 ok syb = self.syb_0_3_6_1; # 7.4.1 ok - xhtml = self.xhtml_3000_2_0_5; # 7.4.1 ok + xhtml = self.xhtml_3000_2_1; # 7.4.1 ok zlib = self.zlib_0_5_3_3; # 7.4.1 ok HTTP = self.HTTP_4000_2_3; # 7.4.1 ok text = self.text_0_11_2_0; # 7.4.1 ok @@ -152,6 +152,11 @@ 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); + haskellPlatformArgs_2011_4_0_0 = self : { inherit (self) cabal ghc; cgi = self.cgi_3001_1_7_4; @@ -1529,7 +1534,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix { inherit (pkgs) zlib; }; - zlib_0_5_3_3 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix { + zlib_0_5_3_3 = callPackage ../development/libraries/haskell/zlib/0.5.3.3.nix { inherit (pkgs) zlib; }; zlib = self.zlib_0_5_3_3; |