From 1392096d69d49ea3b2b92b2a28edf6052fada14c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Aug 2011 09:49:04 +0000 Subject: [PATCH] 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 --- pkgs/top-level/haskell-packages.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7d4893cc3be6..0e0ec19554cc 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -193,6 +193,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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 @@ 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_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 {};