diff --git a/pkgs/development/compilers/ghc/9.4.2.nix b/pkgs/development/compilers/ghc/9.4.3.nix similarity index 99% rename from pkgs/development/compilers/ghc/9.4.2.nix rename to pkgs/development/compilers/ghc/9.4.3.nix index a3eb18e15687..2b0f206a6fb0 100644 --- a/pkgs/development/compilers/ghc/9.4.2.nix +++ b/pkgs/development/compilers/ghc/9.4.3.nix @@ -176,12 +176,12 @@ assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; stdenv.mkDerivation (rec { - version = "9.4.2"; + version = "9.4.3"; pname = "${targetPrefix}ghc${variantSuffix}"; src = fetchurl { url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "7227ef3b5e15a0d70b8f1a43aec32867e2a9b2d857cc0ed556aeed172d4db3a5"; + sha256 = "eaf63949536ede50ee39179f2299d5094eb9152d87cc6fb2175006bc98e8905a"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 5e1600a73f9b..1ca3c9efde94 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -158,7 +158,7 @@ assert !enableNativeBignum -> gmp != null; assert stdenv.hostPlatform == stdenv.targetPlatform || throw '' hadrian doesn't support building an installable GHC cross-compiler at the moment. - Consider using GHC 9.4.2 or lower which support this via the make build system. + Consider using GHC 9.4 or lower which support this via the make build system. See also: https://gitlab.haskell.org/ghc/ghc/-/issues/22090 ''; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 44ffc7335c34..16d4d4a76cac 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -18,7 +18,7 @@ let "ghc90" "ghc924" "ghc92" - "ghc942" + "ghc943" "ghc94" "ghcHEAD" ]; @@ -29,7 +29,7 @@ let "ghc92" "ghc924" "ghc94" - "ghc942" + "ghc943" "ghcHEAD" ]; @@ -165,7 +165,7 @@ in { llvmPackages = pkgs.llvmPackages_12; }; ghc92 = ghc924; - ghc942 = callPackage ../development/compilers/ghc/9.4.2.nix { + ghc943 = callPackage ../development/compilers/ghc/9.4.3.nix { bootPkgs = # Building with 9.2 is broken due to # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 @@ -189,7 +189,7 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc94 = ghc942; + ghc94 = ghc943; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = # For GHC 9.2.3 and 9.2.4 no armv7l bindists are available. @@ -311,12 +311,12 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; }; ghc92 = ghc924; - ghc942 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc942; - ghc = bh.compiler.ghc942; + ghc943 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc943; + ghc = bh.compiler.ghc943; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; }; - ghc94= ghc942; + ghc94 = ghc943; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index baa93c2bff76..53e9c4219ab8 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -53,7 +53,7 @@ let ghc8107 ghc902 ghc924 - ghc942 + ghc943 ]; # packagePlatforms applied to `haskell.packages.*`