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.

svn path=/nixpkgs/trunk/; revision=28923
This commit is contained in:
Peter Simons 2011-08-30 09:49:04 +00:00
parent 3775dea86f
commit 1392096d69

View File

@ -193,6 +193,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
self : self.haskellPlatformArgs_2011_2_0_1 self // { self : self.haskellPlatformArgs_2011_2_0_1 self // {
haskellPlatform = self.haskellPlatform_2011_2_0_1; haskellPlatform = self.haskellPlatform_2011_2_0_1;
mtl1 = self.mtl_1_1_1_1; mtl1 = self.mtl_1_1_1_1;
text = self.text_0_11_1_5;
}; };
haskellPlatform_2011_2_0_1 = haskellPlatform_2011_2_0_1 =
@ -525,9 +526,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
dotgen = callPackage ../development/libraries/haskell/dotgen {}; dotgen = callPackage ../development/libraries/haskell/dotgen {};
doubleConversion = callPackage ../development/libraries/haskell/double-conversion { doubleConversion = callPackage ../development/libraries/haskell/double-conversion {};
text = self.text_0_11_1_5;
};
editline = callPackage ../development/libraries/haskell/editline { editline = callPackage ../development/libraries/haskell/editline {
inherit (pkgs) libedit; inherit (pkgs) libedit;
@ -1168,7 +1167,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {}; 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_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_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 {}; thLift = callPackage ../development/libraries/haskell/th-lift {};