diff options
author | sternenseemann <sternenseemann@systemli.org> | 2023-11-17 11:34:38 +0100 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2023-11-17 12:52:04 +0100 |
commit | d48d90ed8aaa4ed16e6d0e2a27e06cd8746f359e (patch) | |
tree | e928ddf56eba3bdec51ae104dd0c26068e91efbd /pkgs/top-level/haskell-packages.nix | |
parent | 2fd7fa6fbe90e35225ada0d362992823bf656d18 (diff) |
haskellPackages.ghc: 9.4.7 -> 9.4.8
haskell.compiler.ghc94: 9.4.7 -> 9.4.8 haskell.compiler.ghc948: init at 9.4.8 https://www.haskell.org/ghc/blog/20231110-ghc-9.4.8-released.html
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 0b970cb44f042..eed0502749c98 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -25,6 +25,7 @@ let "ghc945" "ghc946" "ghc947" + "ghc948" "ghc94" "ghc96" "ghc962" @@ -50,6 +51,7 @@ let "ghc945" "ghc946" "ghc947" + "ghc948" "ghc96" "ghc962" "ghc963" @@ -363,7 +365,31 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc94 = compiler.ghc947; + ghc948 = callPackage ../development/compilers/ghc/9.4.8.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.ghc948; ghc962 = callPackage ../development/compilers/ghc/9.6.2.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. @@ -558,7 +584,12 @@ in { ghc = bh.compiler.ghc947; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; }; - ghc94 = packages.ghc947; + ghc948 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc948; + ghc = bh.compiler.ghc948; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; + }; + ghc94 = packages.ghc948; ghc962 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc962; ghc = bh.compiler.ghc962; |