public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make statistics and criterion compile with ghc-6.12.3.

Browse Source 
svn path=/nixpkgs/trunk/; revision=31733
This commit is contained in:
Andres Löh 2012-01-20 10:54:09 +00:00
parent c2b80e225c
commit dd83243b8c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/top-level/haskell-packages.nix
View File

@ -332,6 +332,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
self : self.haskellPlatformArgs_2010_2_0_0 self // { self : self.haskellPlatformArgs_2010_2_0_0 self // {
haskellPlatform = self.haskellPlatform_2010_2_0_0; haskellPlatform = self.haskellPlatform_2010_2_0_0;
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u 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 = 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 {}; 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 {}; Crypto = callPackage ../development/libraries/haskell/Crypto {};