From 3cfa24338d708ec4ce47b4ae40841d2cd8db9781 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 22 Feb 2015 14:26:01 +0100 Subject: [PATCH] haskell-QuickCheck: add support for version 1.x to fix various builds --- .../haskell-modules/configuration-common.nix | 7 +++++-- .../haskell-modules/hackage-packages.nix | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 14fd6fcd39a..3f5273806fd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -540,8 +540,11 @@ self: super: { }); wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK29; }; - # Depends on obsolete QuickCheck 1.x. - test-framework-quickcheck = markBroken super.test-framework-quickcheck; + # Depends on QuickCheck 1.x. + ersatz = super.ersatz.override { QuickCheck = self.QuickCheck_1_2_0_1; }; + HaVSA = super.HaVSA.override { QuickCheck = self.QuickCheck_1_2_0_1; }; + lhc = super.lhc.override { QuickCheck = self.QuickCheck_1_2_0_1; }; + test-framework-quickcheck = super.test-framework-quickcheck.override { QuickCheck = self.QuickCheck_1_2_0_1; }; # Depends on broken test-framework-quickcheck. apiary = dontCheck super.apiary; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index cb39c4e8a38..33df76fb792 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -11820,6 +11820,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "QuickCheck_1_2_0_1" = callPackage + ({ mkDerivation, base, random }: + mkDerivation { + pname = "QuickCheck"; + version = "1.2.0.1"; + sha256 = "1gxpvbc0ab4n35b5zcbzng8qc7y3mzgym8cj42bci984f08y1bld"; + editedCabalFile = "8f06f07cae74e90cd5bdde3eed23b0e3293ad494f42f0f0cb77074fa3b7950d9"; + buildDepends = [ base random ]; + homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/"; + description = "Automatic testing of Haskell programs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "QuickCheck" = callPackage ({ mkDerivation, base, random, template-haskell, test-framework , tf-random, transformers