diff options
| author | Peter Simons <simons@cryp.to> | 2015-02-13 15:51:40 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-02-13 22:24:32 +0100 |
| commit | 9db348d7f949e2ddc6ac137709fd2e90eef5687f (patch) | |
| tree | 16f5b3d8f907205384bdf308271a4e403c038ae7 | |
| parent | 4e82b03f29ac9aecd961749a1ccc875f4df77bc4 (diff) | |
| download | nixlib-9db348d7f949e2ddc6ac137709fd2e90eef5687f.tar nixlib-9db348d7f949e2ddc6ac137709fd2e90eef5687f.tar.gz nixlib-9db348d7f949e2ddc6ac137709fd2e90eef5687f.tar.bz2 nixlib-9db348d7f949e2ddc6ac137709fd2e90eef5687f.tar.lz nixlib-9db348d7f949e2ddc6ac137709fd2e90eef5687f.tar.xz nixlib-9db348d7f949e2ddc6ac137709fd2e90eef5687f.tar.zst nixlib-9db348d7f949e2ddc6ac137709fd2e90eef5687f.zip | |
ghc-7.10.x: compile Setup.hs with -threaded to avoid hanging test suites
Closes https://github.com/NixOS/nixpkgs/issues/6259.
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 6d56fd3b84db..b7999bb43368 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -62,10 +62,6 @@ self: super: { # bos/attoparsec#92 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. # https://code.google.com/p/scrapyourboilerplate/issues/detail?id=24 syb = dontCheck super.syb; @@ -79,10 +75,6 @@ self: super: { # Version 1.19.5 fails its test suite. 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". alex = dontCheck super.alex; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 303a9d7859a9..8e730fd37f03 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -88,6 +88,7 @@ let setupCompileFlags = [ (optionalString (!coreSetup) "-${packageDbFlag}=$packageConfDir") (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); |