From 69d6b66571c0c79975b35d16ce4698c0845f7329 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Feb 2012 21:00:09 +0000 Subject: [PATCH] haskell-packages.nix: the latest regexPosix must use a matching regexBase in order to compile with older versions of GHC, i.e. 6.10.4 svn path=/nixpkgs/trunk/; revision=32013 --- pkgs/top-level/haskell-packages.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b52f6d39271..e0a32a8f4ad 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1168,11 +1168,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexCompat = self.regexCompat_0_71_0_1; regexPosix_0_72_0_3 = callPackage ../development/libraries/haskell/regex-posix/0.72.0.3.nix {}; - regexPosix_0_94_1 = callPackage ../development/libraries/haskell/regex-posix/0.94.1.nix {}; - regexPosix_0_94_2 = callPackage ../development/libraries/haskell/regex-posix/0.94.2.nix {}; - regexPosix_0_94_4 = callPackage ../development/libraries/haskell/regex-posix/0.94.4.nix {}; - regexPosix_0_95_1 = callPackage ../development/libraries/haskell/regex-posix/0.95.1.nix {}; - regexPosix = self.regexPosix_0_72_0_3; + regexPosix_0_94_1 = callPackage ../development/libraries/haskell/regex-posix/0.94.1.nix {}; + regexPosix_0_94_2 = callPackage ../development/libraries/haskell/regex-posix/0.94.2.nix {}; + regexPosix_0_94_4 = callPackage ../development/libraries/haskell/regex-posix/0.94.4.nix {}; + regexPosix_0_95_1 = callPackage ../development/libraries/haskell/regex-posix/0.95.1.nix { + regexBase = self.regexBase_0_93_2; + }; + regexPosix = self.regexPosix_0_95_1; regexTDFA = callPackage ../development/libraries/haskell/regex-tdfa {}; regexTdfa = self.regexTDFA;