Merge pull request #47901 from dhess/ghc-aarch64
haskell: re-enable aarch64, but disable parallel builds on that arch.
This commit is contained in:
@@ -169,6 +169,5 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
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"];
|
||||
}
|
||||
|
||||
@@ -88,7 +88,8 @@ stdenv.mkDerivation (rec {
|
||||
sha256 = "1z05vkpaj54xdypmaml50hgsdpw29dhbs2r7magx0cm199iw73mv";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
# https://ghc.haskell.org/trac/ghc/ticket/15449
|
||||
enableParallelBuilding = !buildPlatform.isAarch64;
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
|
||||
@@ -90,7 +90,8 @@ stdenv.mkDerivation (rec {
|
||||
sha256 = "1mk046vb561j75saz05rghhbkps46ym5aci4264dwc2qk3dayixf";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
# https://ghc.haskell.org/trac/ghc/ticket/15449
|
||||
enableParallelBuilding = !buildPlatform.isAarch64;
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
|
||||
@@ -86,7 +86,8 @@ stdenv.mkDerivation (rec {
|
||||
sha256 = "0dkh7idgrqr567fq94a0f5x3w0r4cm2ydn51nb5wfisw3rnw499c";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
# https://ghc.haskell.org/trac/ghc/ticket/15449
|
||||
enableParallelBuilding = !buildPlatform.isAarch64;
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user