haskell.compiler.ghc92: 9.2.4 -> 9.2.5

1 files changed, 27 insertions, 3 deletions

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 16d4d4a76cac..6896d02f3cb6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -17,6 +17,7 @@ let
     "ghc902"
     "ghc90"
     "ghc924"
+    "ghc925"
     "ghc92"
     "ghc943"
     "ghc94"
@@ -28,6 +29,7 @@ let
     "ghc902"
     "ghc92"
     "ghc924"
+    "ghc925"
     "ghc94"
     "ghc943"
     "ghcHEAD"
@@ -164,7 +166,24 @@ in {
       buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
       llvmPackages = pkgs.llvmPackages_12;
     };
-    ghc92 = ghc924;
+    ghc925 = callPackage ../development/compilers/ghc/9.2.5.nix {
+      bootPkgs =
+        # aarch64 ghc8107Binary exceeds max output size on hydra
+        if stdenv.hostPlatform.isAarch then
+          packages.ghc8107BinaryMinimal
+        else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
+          packages.ghc810
+        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;
+      buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
+      llvmPackages = pkgs.llvmPackages_12;
+    };
+    ghc92 = ghc925;
     ghc943 = callPackage ../development/compilers/ghc/9.4.3.nix {
       bootPkgs =
         # Building with 9.2 is broken due to
@@ -192,7 +211,7 @@ in {
     ghc94 = ghc943;
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
       bootPkgs =
-        # For GHC 9.2.3 and 9.2.4 no armv7l bindists are available.
+        # For GHC 9.2 no armv7l bindists are available.
         if stdenv.hostPlatform.isAarch32 then
           packages.ghc924
         else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
@@ -310,7 +329,12 @@ in {
       ghc = bh.compiler.ghc924;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { };
     };
-    ghc92 = ghc924;
+    ghc925 = callPackage ../development/haskell-modules {
+      buildHaskellPackages = bh.packages.ghc925;
+      ghc = bh.compiler.ghc925;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { };
+    };
+    ghc92 = ghc925;
     ghc943 = callPackage ../development/haskell-modules {
       buildHaskellPackages = bh.packages.ghc943;
       ghc = bh.compiler.ghc943;