diff options
author | sternenseemann <sternenseemann@systemli.org> | 2022-12-25 19:09:08 +0100 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2022-12-29 13:49:47 +0100 |
commit | 9e8a48377099d80406904f6c31133c169560d5be (patch) | |
tree | c0a2f30b6f87e376fca119fbb7d29dd009f0b9f9 /pkgs/top-level/haskell-packages.nix | |
parent | fb32148a96e64be4b11000770ea1e9e83966b572 (diff) | |
download | nixlib-9e8a48377099d80406904f6c31133c169560d5be.tar nixlib-9e8a48377099d80406904f6c31133c169560d5be.tar.gz nixlib-9e8a48377099d80406904f6c31133c169560d5be.tar.bz2 nixlib-9e8a48377099d80406904f6c31133c169560d5be.tar.lz nixlib-9e8a48377099d80406904f6c31133c169560d5be.tar.xz nixlib-9e8a48377099d80406904f6c31133c169560d5be.tar.zst nixlib-9e8a48377099d80406904f6c31133c169560d5be.zip |
haskell.compiler.ghc94: 9.4.2 -> 9.4.4
https://www.haskell.org/ghc/blog/20221103-ghc-9.4.3-released.html https://www.haskell.org/ghc/blog/20221224-ghc-9.4.4-released.html
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index bf43f22c9b49..35281cf5f086 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -21,6 +21,7 @@ let "ghc92" "ghc942" "ghc943" + "ghc944" "ghc94" "ghcHEAD" ]; @@ -34,6 +35,7 @@ let "ghc94" "ghc942" "ghc943" + "ghc944" "ghcHEAD" ]; @@ -234,7 +236,31 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc94 = ghc942; + ghc944 = callPackage ../development/compilers/ghc/9.4.4.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 = ghc944; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. @@ -371,6 +397,11 @@ in { ghc = bh.compiler.ghc943; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; }; + ghc944 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc944; + ghc = bh.compiler.ghc944; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; + }; ghc94 = ghc942; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; |