diff options
| author | Will Young <lost.networking@gmail.com> | 2020-10-19 20:32:49 +0200 |
|---|---|---|
| committer | Will Young <lost.networking@gmail.com> | 2020-10-21 21:13:22 +0200 |
| commit | 1c2ee215abdf98065f5011bcbc0e156688926b9d (patch) | |
| tree | 40f33814cde4532f35687ef7e85cc0917d6d24e7 /pkgs/top-level/haskell-packages.nix | |
| parent | b50ef4e3f226dde6c34817e3f92ca0aa3e18a72e (diff) | |
| download | nixpkgs-1c2ee215abdf98065f5011bcbc0e156688926b9d.tar nixpkgs-1c2ee215abdf98065f5011bcbc0e156688926b9d.tar.gz nixpkgs-1c2ee215abdf98065f5011bcbc0e156688926b9d.tar.bz2 nixpkgs-1c2ee215abdf98065f5011bcbc0e156688926b9d.tar.lz nixpkgs-1c2ee215abdf98065f5011bcbc0e156688926b9d.tar.xz nixpkgs-1c2ee215abdf98065f5011bcbc0e156688926b9d.tar.zst nixpkgs-1c2ee215abdf98065f5011bcbc0e156688926b9d.zip | |
ghc:8.10.2Binary bootstrap for 8.8 on aarch64 (NixOS#97407)
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 693f8fe8276..0db955c2ae4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,4 +1,4 @@ -{ buildPackages, pkgs, newScope }: +{ buildPackages, pkgs, newScope, stdenv }: let # These are attributes in compiler and packages that don't support integer-simple. @@ -73,7 +73,11 @@ in { llvmPackages = pkgs.llvmPackages_7; }; ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix { - bootPkgs = packages.ghc865Binary; + # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar + bootPkgs = if stdenv.isAarch64 then + packages.ghc8102Binary + else + packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_7; llvmPackages = pkgs.llvmPackages_7; @@ -85,7 +89,11 @@ in { llvmPackages = pkgs.llvmPackages_9; }; ghc8102 = callPackage ../development/compilers/ghc/8.10.2.nix { - bootPkgs = packages.ghc865Binary; + # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar + bootPkgs = if stdenv.isAarch64 then + packages.ghc8102Binary + else + packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9; |