MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 07:46:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ghc-7.10.x: compile Setup.hs with -threaded to avoid hanging test suites

Browse source 
Closes https://github.com/NixOS/nixpkgs/issues/6259.
This commit is contained in:
Peter Simons 2015-02-13 15:51:40 +01:00
parent 4e82b03f29
commit 9db348d7f9
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View file

@ -62,10 +62,6 @@ self: super: {
# bos/attoparsec#92 # bos/attoparsec#92
attoparsec = dontCheck super.attoparsec; attoparsec = dontCheck super.attoparsec;
# test suite hangs silently for at least 10 minutes
ChasingBottoms = dontCheck super.ChasingBottoms;
split = dontCheck super.split;
# Test suite fails with some (seemingly harmless) error. # Test suite fails with some (seemingly harmless) error.
# https://code.google.com/p/scrapyourboilerplate/issues/detail?id=24 # https://code.google.com/p/scrapyourboilerplate/issues/detail?id=24
syb = dontCheck super.syb; syb = dontCheck super.syb;
@ -79,10 +75,6 @@ self: super: {
# Version 1.19.5 fails its test suite. # Version 1.19.5 fails its test suite.
happy = dontCheck super.happy; happy = dontCheck super.happy;
# Test suite hangs silently without consuming any CPU.
# https://github.com/ndmitchell/extra/issues/4
extra = dontCheck super.extra;
# Test suite fails in "/tokens_bytestring_unicode.g.bin". # Test suite fails in "/tokens_bytestring_unicode.g.bin".
alex = dontCheck super.alex; alex = dontCheck super.alex;

1
pkgs/development/haskell-modules/generic-builder.nix
View file

@ -88,6 +88,7 @@ let
setupCompileFlags = [ setupCompileFlags = [
(optionalString (!coreSetup) "-${packageDbFlag}=$packageConfDir") (optionalString (!coreSetup) "-${packageDbFlag}=$packageConfDir")
(optionalString (versionOlder "7.8" ghc.version) "-j$NIX_BUILD_CORES") (optionalString (versionOlder "7.8" ghc.version) "-j$NIX_BUILD_CORES")
(optionalString (versionOlder "7.10" ghc.version) "-threaded") # https://github.com/haskell/cabal/issues/2398
]; ];
isHaskellPkg = x: (x ? pname) && (x ? version) && (x ? env); isHaskellPkg = x: (x ? pname) && (x ? version) && (x ? env);