From 8fdba8ca99b5c6453521b739afe01fd00a99677d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 15 Mar 2018 15:06:01 +0100 Subject: [PATCH] haskell-test-framework: disable test suite build This avoids a dependency on an old version of QuickCheck. --- .../haskell-modules/configuration-common.nix | 3 +++ .../haskell-modules/configuration-ghc-8.4.x.nix | 12 ------------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ee8c65b3d3c5..b40bd1fbef63 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -418,6 +418,9 @@ self: super: { HaVSA = super.HaVSA.override { QuickCheck = self.QuickCheck_1_2_0_1; }; test-framework-quickcheck = super.test-framework-quickcheck.override { QuickCheck = self.QuickCheck_1_2_0_1; }; + # Avoid "QuickCheck >=2.3 && <2.10" dependency we cannot fulfill in lts-11.x. + test-framework = dontCheck super.test-framework; + # Depends on broken test-framework-quickcheck. apiary = dontCheck super.apiary; apiary-authenticate = dontCheck super.apiary-authenticate; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 196888c2883d..9a987424e58c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -169,18 +169,6 @@ self: super: { ## doctest >=0.11.1 && <0.14 semigroupoids = super.semigroupoids_5_2_2; - ## Needs bump to a versioned attribute - ## Issue: https://github.com/haskell/test-framework/issues/35 - test-framework = overrideCabal super.test-framework_0_8_2_0 (drv: { - ## • No instance for (Semigroup (TestOptions' Maybe)) - ## arising from the superclasses of an instance declaration - ## • In the instance declaration for ‘Monoid (TestOptions' Maybe)’ - ## - ## Setup: Encountered missing dependencies: - ## QuickCheck >=2.3 && <2.10 - doCheck = false; - }); - ## Needs bump to a versioned attribute ## Setup: Encountered missing dependencies: ## doctest >=0.7 && <0.14