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

cabal2nix: fix build with old versions of GHC

This commit is contained in:
Peter Simons 2014-10-06 11:29:44 +02:00
parent a01a64e5a4
commit 2da7e03ed7
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/tools/haskell/cabal2nix/default.nix
View File

@ -14,7 +14,7 @@ cabal.mkDerivation (self: {
Cabal filepath hackageDb mtl regexPosix transformers
];
testDepends = [ doctest ];
doCheck = self.stdenv.lib.versionOlder "7.6" self.ghc.version;
doCheck = self.stdenv.lib.versionOlder "7.8" self.ghc.version;
meta = {
homepage = "http://github.com/NixOS/cabal2nix";
description = "Convert Cabal files into Nix build instructions";

1
pkgs/top-level/haskell-defaults.nix
View File

@ -37,6 +37,7 @@
attoparsec = self.attoparsec_0_11_3_1;
binaryConduit = super.binaryConduit.override { binary = self.binary_0_7_2_1; };
bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_2_1; }; };
cabal2nix = super.cabal2nix.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_18_1_3; }; };
criterion = super.criterion.override {
statistics = self.statistics.override {
vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_2_1; };