diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2018-10-07 15:09:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-07 15:09:33 -0400 |
| commit | d8d85848ce4ae23ba1afb8a078e830a31cac9d18 (patch) | |
| tree | b8327611632de491a981d90586d62ba204381a95 /pkgs/development/compilers | |
| parent | 938a0ddf4a05137907ac019a793c26a29b13a1b9 (diff) | |
| parent | 4babe7f799e826a040869728a0be56c68071c0ea (diff) | |
| download | nixlib-d8d85848ce4ae23ba1afb8a078e830a31cac9d18.tar nixlib-d8d85848ce4ae23ba1afb8a078e830a31cac9d18.tar.gz nixlib-d8d85848ce4ae23ba1afb8a078e830a31cac9d18.tar.bz2 nixlib-d8d85848ce4ae23ba1afb8a078e830a31cac9d18.tar.lz nixlib-d8d85848ce4ae23ba1afb8a078e830a31cac9d18.tar.xz nixlib-d8d85848ce4ae23ba1afb8a078e830a31cac9d18.tar.zst nixlib-d8d85848ce4ae23ba1afb8a078e830a31cac9d18.zip | |
Merge pull request #47901 from dhess/ghc-aarch64
haskell: re-enable aarch64, but disable parallel builds on that arch.
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.2.1-binary.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.2.2.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.4.3.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.6.1.nix | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix index bfb9c4cd6164..6caeaf20f64c 100644 --- a/pkgs/development/compilers/ghc/8.2.1-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix @@ -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"]; } diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index b548b05339e4..8c3012f881c6 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -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" ]; diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index e43f9a57d0a4..7cd7494df050 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -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" ]; diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index 62ea39791b90..a2be9d255713 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -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" ]; |