From dba20cb1b1b60a57bd4b3088483fd43b41c61912 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 10 Mar 2018 13:32:07 +0100 Subject: [PATCH] haskell-ChasingBottoms: move jailbreak to common to allow building with QuickCheck 2.11 --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++-- .../development/haskell-modules/configuration-ghc-8.4.x.nix | 6 ------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4217b2d0357..7c4ba04f1b6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -946,8 +946,9 @@ self: super: { # Tries to read a file it is not allowed to in the test suite load-env = dontCheck super.load-env; - # Sporadically OOMs even with 16G - ChasingBottoms = dontCheck super.ChasingBottoms; + # Disable test suite because it sporadically OOMs even with 16G. + # Jailbreak for QuickCheck >=2.3 && <2.11, base >=4.2 && <4.11. + ChasingBottoms = doJailbreak (dontCheck super.ChasingBottoms); # Add support for https://github.com/haskell-hvr/multi-ghc-travis. multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis {}; 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 a8d79dcddc2..5a75e15af19 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -588,12 +588,6 @@ self: super: { jailbreak = true; }); - ChasingBottoms = overrideCabal super.ChasingBottoms (drv: { - ## Setup: Encountered missing dependencies: - ## QuickCheck >=2.3 && <2.11, base >=4.2 && <4.11 - jailbreak = true; - }); - deepseq-generics = overrideCabal super.deepseq-generics (drv: { ## Setup: Encountered missing dependencies: ## base >=4.5 && <4.11