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

Merge pull request #47901 from dhess/ghc-aarch64

Browse Source 
haskell: re-enable aarch64, but disable parallel builds on that arch.
This commit is contained in:
Samuel Dionne-Riel 2018-10-07 15:09:33 -04:00 committed by GitHub
commit d8d85848ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/ghc/8.2.1-binary.nix
View File

@ -169,6 +169,5 @@ stdenv.mkDerivation rec {
}; };
meta.license = stdenv.lib.licenses.bsd3; meta.license = stdenv.lib.licenses.bsd3;
# AArch64 should work in theory but eventually some builds start segfaulting meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" "aarch64-linux"];
meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" /* "aarch64-linux" */];
} }

3
pkgs/development/compilers/ghc/8.2.2.nix
View File

@ -88,7 +88,8 @@ stdenv.mkDerivation (rec {
sha256 = "1z05vkpaj54xdypmaml50hgsdpw29dhbs2r7magx0cm199iw73mv"; sha256 = "1z05vkpaj54xdypmaml50hgsdpw29dhbs2r7magx0cm199iw73mv";
}; };
enableParallelBuilding = true; # https://ghc.haskell.org/trac/ghc/ticket/15449
enableParallelBuilding = !buildPlatform.isAarch64;
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];

3
pkgs/development/compilers/ghc/8.4.3.nix
View File

@ -90,7 +90,8 @@ stdenv.mkDerivation (rec {
sha256 = "1mk046vb561j75saz05rghhbkps46ym5aci4264dwc2qk3dayixf"; sha256 = "1mk046vb561j75saz05rghhbkps46ym5aci4264dwc2qk3dayixf";
}; };
enableParallelBuilding = true; # https://ghc.haskell.org/trac/ghc/ticket/15449
enableParallelBuilding = !buildPlatform.isAarch64;
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];

3
pkgs/development/compilers/ghc/8.6.1.nix
View File

@ -86,7 +86,8 @@ stdenv.mkDerivation (rec {
sha256 = "0dkh7idgrqr567fq94a0f5x3w0r4cm2ydn51nb5wfisw3rnw499c"; sha256 = "0dkh7idgrqr567fq94a0f5x3w0r4cm2ydn51nb5wfisw3rnw499c";
}; };
enableParallelBuilding = true; # https://ghc.haskell.org/trac/ghc/ticket/15449
enableParallelBuilding = !buildPlatform.isAarch64;
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];

4
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -48,7 +48,9 @@ in
# We cannot enable -j<n> parallelism for libraries because GHC is far more # We cannot enable -j<n> parallelism for libraries because GHC is far more
# likely to generate a non-determistic library ID in that case. Further # likely to generate a non-determistic library ID in that case. Further
# details are at <https://github.com/peti/ghc-library-id-bug>. # details are at <https://github.com/peti/ghc-library-id-bug>.
, enableParallelBuilding ? (stdenv.lib.versionOlder "7.8" ghc.version && !isLibrary) || stdenv.lib.versionOlder "8.0.1" ghc.version #
# Currently disabled for aarch64. See https://ghc.haskell.org/trac/ghc/ticket/15449.
, enableParallelBuilding ? ((stdenv.lib.versionOlder "7.8" ghc.version && !isLibrary) || stdenv.lib.versionOlder "8.0.1" ghc.version) && !(stdenv.buildPlatform.isAarch64)
, maintainers ? [] , maintainers ? []
, doCoverage ? false , doCoverage ? false
, doHaddock ? !(ghc.isHaLVM or false) , doHaddock ? !(ghc.isHaLVM or false)