From 6569f68dde909de5706d8b7de516f08643ba6db3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Dec 2011 18:01:00 +0000 Subject: [PATCH] haskell-packages.nix: use the current version of parsec 3.x with GHC 7.2 or later svn path=/nixpkgs/trunk/; revision=30828 --- pkgs/top-level/haskell-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e2169280610e..27e3f8d89914 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -143,7 +143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); network = self.network_2_3_0_7; # 7.2 ok, 7.3 ok OpenGL = self.OpenGL_2_2_3_0; # 7.2 ok, 7.3 ok parallel = self.parallel_3_1_0_1; # 7.2 ok, 7.3 ok - parsec = self.parsec_3_1_1; # 7.2 ok, 7.3 ok + parsec = self.parsec_3_1_2; # 7.2 ok, 7.3 ok QuickCheck = self.QuickCheck_2_4_0_1; # 7.2 ok, 7.3 ok regexBase = self.regexBase_0_93_2; # 7.2 ok, 7.3 ok regexCompat = self.regexCompat_0_93_1; # 7.2 ok, 7.3 ok @@ -957,7 +957,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); parsec_3_1_2 = callPackage ../development/libraries/haskell/parsec/3.1.2.nix {}; parsec2 = self.parsec_2_1_0_1; parsec3 = self.parsec_3_1_2; - parsec = self.parsec2; + parsec = self.parsec3; parsimony = callPackage ../development/libraries/haskell/parsimony {};