Author: simons
Date: Tue Aug 30 09:49:04 2011
New Revision: 28923
URL: https://svn.nixos.org/websvn/nix/?rev=28923&sc=1

Log:
Updated the default version of haskell-text to 0.11.1.5.

A growing number of packages don't build with the old version. I was
reluctant to make that change because Haskell Platform 2011.2.0.1 says
that text 0.11.0.6 ought to be used, but then HP says we shouldn't be
using GHC 7.0.4 either, yet we do. Anyway, upgrading the text library
caused no problems: all packages just built fine, so there you go.

Modified:
   nixpkgs/trunk/pkgs/top-level/haskell-packages.nix

Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Tue Aug 30 09:17:38 
2011        (r28922)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Tue Aug 30 09:49:04 
2011        (r28923)
@@ -193,6 +193,7 @@
     self : self.haskellPlatformArgs_2011_2_0_1 self // {
       haskellPlatform = self.haskellPlatform_2011_2_0_1;
       mtl1 = self.mtl_1_1_1_1;
+      text = self.text_0_11_1_5;
     };
 
   haskellPlatform_2011_2_0_1 =
@@ -525,9 +526,7 @@
 
   dotgen = callPackage ../development/libraries/haskell/dotgen {};
 
-  doubleConversion = callPackage 
../development/libraries/haskell/double-conversion {
-    text = self.text_0_11_1_5;
-  };
+  doubleConversion = callPackage 
../development/libraries/haskell/double-conversion {};
 
   editline = callPackage ../development/libraries/haskell/editline {
     inherit (pkgs) libedit;
@@ -1168,7 +1167,7 @@
   text_0_11_0_5 = callPackage 
../development/libraries/haskell/text/0.11.0.5.nix {};
   text_0_11_0_6 = callPackage 
../development/libraries/haskell/text/0.11.0.6.nix {};
   text_0_11_1_5 = callPackage 
../development/libraries/haskell/text/0.11.1.5.nix {};
-  text = self.text_0_11_0_5;
+  text = self.text_0_11_1_5;
 
   thLift = callPackage ../development/libraries/haskell/th-lift {};
 
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to