Author: andres
Date: Fri Jan 20 10:54:09 2012
New Revision: 31733
URL: https://nixos.org/websvn/nix/?rev=31733&sc=1
Log:
Make statistics and criterion compile with ghc-6.12.3.
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Fri Jan 20 10:43:18
2012 (r31732)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Fri Jan 20 10:54:09
2012 (r31733)
@@ -332,6 +332,8 @@
self : self.haskellPlatformArgs_2010_2_0_0 self // {
haskellPlatform = self.haskellPlatform_2010_2_0_0;
repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
+ deepseq = self.deepseq_1_1_0_2;
+ # deviating from Haskell platform here, to make some packages (notably
statistics) compile
};
haskellPlatform_2010_2_0_0 =
@@ -553,7 +555,10 @@
cprngAes = callPackage ../development/libraries/haskell/cprng-aes {};
- criterion = callPackage ../development/libraries/haskell/criterion {};
+ criterion = callPackage ../development/libraries/haskell/criterion {
+ mtl = self.mtl2;
+ parsec = self.parsec3;
+ };
Crypto = callPackage ../development/libraries/haskell/Crypto {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
