From 1d3ef2fef83aa9cd1a64967893611d01c78f2e06 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2015 13:58:16 +0200 Subject: [PATCH] haskell: simplify overrides for QuickCheck and zlib --- pkgs/development/haskell-modules/configuration-common.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c05dbb5c06f6..0bba17bbe380 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -157,9 +157,6 @@ self: super: { patchPhase = "sed -i -e 's|attoparsec.*,|attoparsec,|' darcs.cabal"; }); - # Needs the latest version of QuickCheck to compile. - cabal-test-quickcheck = super.cabal-test-quickcheck.override { QuickCheck = self.QuickCheck_2_8_1; }; - # https://github.com/massysett/rainbox/issues/1 rainbox = dontCheck super.rainbox; @@ -762,10 +759,7 @@ self: super: { in appendPatch pkg ./mueval-nix.patch; # Test suite won't compile against tasty-hunit 0.9.x. - zlib_0_6_1_0 = dontCheck super.zlib_0_6_1_0; - - # Jailbreaking breaks the build. - QuickCheck_2_8_1 = dontJailbreak super.QuickCheck_2_8_1; + zlib = dontCheck super.zlib; # Override the obsolete version from Hackage with our more up-to-date copy. cabal2nix = pkgs.cabal2nix;