From ffa89c82fdeff3bd04f0eada559456ae2a229489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sun, 18 Dec 2011 11:26:46 +0000 Subject: [PATCH] Trying to fix the build of darcs for ghc-7.0.4. svn path=/nixpkgs/trunk/; revision=30952 --- pkgs/top-level/haskell-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 990a3766c9e5..df236bc2c8f2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1100,6 +1100,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexCompat_0_95_1 = callPackage ../development/libraries/haskell/regex-compat/0.95.1.nix { regexPosix = self.regexPosix_0_95_1; }; + regexCompat93 = self.regexCompat_0_93_1; regexCompat = self.regexCompat_0_71_0_1; regexPosix_0_72_0_3 = callPackage ../development/libraries/haskell/regex-posix/0.72.0.3.nix {}; @@ -1502,7 +1503,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # Applications. - darcs = callPackage ../applications/version-management/darcs {}; + darcs = callPackage ../applications/version-management/darcs { + regexCompat = self.regexCompat93; + }; leksah = callPackage ../applications/editors/leksah {};