diff options
author | sternenseemann <sternenseemann@systemli.org> | 2022-05-15 11:40:11 +0200 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2022-09-22 16:18:17 +0200 |
commit | da60f2dc9c95692804fa6575fa467e659de5031b (patch) | |
tree | f4625aa1adc726ad5826af7b53392500714c96c8 /pkgs/top-level/haskell-packages.nix | |
parent | 41622a3f98416365894f23a4f0dab0df3930b836 (diff) |
haskell.compiler.ghcHEAD: 9.3.20220406 -> 9.5.20220921
Initial port of our GHC Nix expressions to the new hadrian build system, as it has become required after 9.4. Unfortunately there are some regressions affecting us, namely the inability to install a GHC cross-compiler at the moment (see issue linked in relevant error message). This means that a lot of specific configuration snippets for cross-platforms and static compilation have been ported from make speculatively, as we are unable to test them for the moment.
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 66e94b12c5b0e..8d512968a857c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -192,18 +192,20 @@ in { ghc94 = ghc942; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = - if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc8107 + if stdenv.isAarch64 || stdenv.isAarch32 then + packages.ghc922BinaryMinimal + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + packages.ghc924 else - packages.ghc8107Binary; + packages.ghc922Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; + # 2022-08-04: Support range >= 10 && < 14 buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; - libffi = pkgs.libffi; }; ghcjs = compiler.ghcjs810; |