diff options
author | Andres Löh <mail@andres-loeh.de> | 2011-12-18 11:26:46 +0000 |
---|---|---|
committer | Andres Löh <mail@andres-loeh.de> | 2011-12-18 11:26:46 +0000 |
commit | ffa89c82fdeff3bd04f0eada559456ae2a229489 (patch) | |
tree | 1108612dee82b29d53332f0dbee2f499a01d05db /pkgs | |
parent | e20ab8d9b385b07ed9d06fae5a39a3e602487cce (diff) | |
download | nixlib-ffa89c82fdeff3bd04f0eada559456ae2a229489.tar nixlib-ffa89c82fdeff3bd04f0eada559456ae2a229489.tar.gz nixlib-ffa89c82fdeff3bd04f0eada559456ae2a229489.tar.bz2 nixlib-ffa89c82fdeff3bd04f0eada559456ae2a229489.tar.lz nixlib-ffa89c82fdeff3bd04f0eada559456ae2a229489.tar.xz nixlib-ffa89c82fdeff3bd04f0eada559456ae2a229489.tar.zst nixlib-ffa89c82fdeff3bd04f0eada559456ae2a229489.zip |
Trying to fix the build of darcs for ghc-7.0.4.
svn path=/nixpkgs/trunk/; revision=30952
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 5 |
1 files changed, 4 insertions, 1 deletions
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 {}; |