diff options
author | sternenseemann <sternenseemann@systemli.org> | 2023-08-30 16:18:57 +0200 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2023-10-04 17:13:56 +0200 |
commit | 32c1a8c383fdff0d6647b0d9cfe3d9bb3afa3fd2 (patch) | |
tree | 76cd6b69c93224d877892e8bf232df8fe8fd349b /pkgs/top-level/haskell-packages.nix | |
parent | aa78902905038aaae5a8a81e6aefa0921e64cbc7 (diff) | |
download | nixlib-32c1a8c383fdff0d6647b0d9cfe3d9bb3afa3fd2.tar nixlib-32c1a8c383fdff0d6647b0d9cfe3d9bb3afa3fd2.tar.gz nixlib-32c1a8c383fdff0d6647b0d9cfe3d9bb3afa3fd2.tar.bz2 nixlib-32c1a8c383fdff0d6647b0d9cfe3d9bb3afa3fd2.tar.lz nixlib-32c1a8c383fdff0d6647b0d9cfe3d9bb3afa3fd2.tar.xz nixlib-32c1a8c383fdff0d6647b0d9cfe3d9bb3afa3fd2.tar.zst nixlib-32c1a8c383fdff0d6647b0d9cfe3d9bb3afa3fd2.zip |
haskellPackages.ghc: 9.4.6 -> 9.4.7
https://www.haskell.org/ghc/blog/20230825-ghc-9.4.7-released.html Notice that useLLVM is disabled for all aarch64 platforms to match
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c57302ccaa8b..cf78a6afe4a2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -24,6 +24,7 @@ let "ghc944" "ghc945" "ghc946" + "ghc947" "ghc94" "ghc96" "ghc962" @@ -45,6 +46,7 @@ let "ghc944" "ghc945" "ghc946" + "ghc947" "ghc96" "ghc962" "ghcHEAD" @@ -331,7 +333,31 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc94 = compiler.ghc946; + ghc947 = callPackage ../development/compilers/ghc/9.4.7.nix { + bootPkgs = + # Building with 9.2 is broken due to + # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 + # Use 8.10 as a workaround where possible to keep bootstrap path short. + + # On ARM text won't build with GHC 8.10.* + if stdenv.hostPlatform.isAarch then + # TODO(@sternenseemann): package bindist + packages.ghc902 + # No suitable bindists for powerpc64le + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + packages.ghc902 + else + packages.ghc8107Binary; + 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; + # Support range >= 10 && < 14 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; + llvmPackages = pkgs.llvmPackages_12; + }; + ghc94 = compiler.ghc947; ghc962 = callPackage ../development/compilers/ghc/9.6.2.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. @@ -497,7 +523,12 @@ in { ghc = bh.compiler.ghc946; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; }; - ghc94 = packages.ghc946; + ghc947 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc947; + ghc = bh.compiler.ghc947; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; + }; + ghc94 = packages.ghc947; ghc962 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc962; ghc = bh.compiler.ghc962; |