From 2fe11e6fee6d723f738cd1ec27baaea8a678dcea Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 20 Apr 2023 17:50:25 +0200 Subject: haskell.compiler.ghc94: 9.4.4 -> 9.4.5 https://www.haskell.org/ghc/blog/20230418-ghc-9.4.5-released.html --- pkgs/top-level/haskell-packages.nix | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) (limited to 'pkgs/top-level/haskell-packages.nix') diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5941959a815b3..3ed35bf460597 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -24,6 +24,7 @@ let "ghc942" "ghc943" "ghc944" + "ghc945" "ghc94" "ghc96" "ghc961" @@ -42,6 +43,7 @@ let "ghc942" "ghc943" "ghc944" + "ghc945" "ghc96" "ghc961" "ghcHEAD" @@ -302,7 +304,31 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc94 = ghc944; + ghc945 = callPackage ../development/compilers/ghc/9.4.5.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 = ghc945; ghc961 = callPackage ../development/compilers/ghc/9.6.1.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. @@ -475,7 +501,12 @@ in { ghc = bh.compiler.ghc944; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; }; - ghc94 = ghc944; + ghc945 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc945; + ghc = bh.compiler.ghc945; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; + }; + ghc94 = ghc945; ghc961 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc961; ghc = bh.compiler.ghc961; -- cgit 1.4.1