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

haskell-ChasingBottoms: move jailbreak to common to allow building with QuickCheck 2.11

Browse Source
This commit is contained in:
Peter Simons 2018-03-10 13:32:07 +01:00
parent 0ff88fb2ab
commit dba20cb1b1
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -946,8 +946,9 @@ self: super: {
# Tries to read a file it is not allowed to in the test suite # Tries to read a file it is not allowed to in the test suite
load-env = dontCheck super.load-env; load-env = dontCheck super.load-env;
# Sporadically OOMs even with 16G # Disable test suite because it sporadically OOMs even with 16G.
ChasingBottoms = dontCheck super.ChasingBottoms; # 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. # Add support for https://github.com/haskell-hvr/multi-ghc-travis.
multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis {}; multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis {};

6
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View File

@ -588,12 +588,6 @@ self: super: {
jailbreak = true; 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: { deepseq-generics = overrideCabal super.deepseq-generics (drv: {
## Setup: Encountered missing dependencies: ## Setup: Encountered missing dependencies:
## base >=4.5 && <4.11 ## base >=4.5 && <4.11