From dd83243b8c8ae3333e4099c8d4df000a5f8a04f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Fri, 20 Jan 2012 10:54:09 +0000 Subject: [PATCH] Make statistics and criterion compile with ghc-6.12.3. svn path=/nixpkgs/trunk/; revision=31733 --- pkgs/top-level/haskell-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2aba0b4afd3..87448499a42 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -332,6 +332,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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 {};