From 1d78ad9ea4fe35bfeb42df910220f0b5b82f6750 Mon Sep 17 00:00:00 2001
From: Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
Date: Tue, 26 Sep 2023 19:13:19 -0400
Subject: haskell.compiler.ghc96: 9.6.2 -> 9.6.3

https://www.haskell.org/ghc/blog/20230925-ghc-9.6.3-released.html
---
 pkgs/development/compilers/ghc/9.6.3.nix |  4 ++++
 pkgs/top-level/haskell-packages.nix      | 29 +++++++++++++++++++++++++++--
 pkgs/top-level/release-haskell.nix       |  5 +++++
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/compilers/ghc/9.6.3.nix

diff --git a/pkgs/development/compilers/ghc/9.6.3.nix b/pkgs/development/compilers/ghc/9.6.3.nix
new file mode 100644
index 00000000000..35bbf020acb
--- /dev/null
+++ b/pkgs/development/compilers/ghc/9.6.3.nix
@@ -0,0 +1,4 @@
+import ./common-hadrian.nix rec {
+  version = "9.6.3";
+  sha256 = "1xbpxchmvm9gswrwwz1rsvx9kjaxhc2q3fx9l6wa0l5599xydkfz";
+}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c57302ccaa8..71d3f7a7869 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -27,6 +27,7 @@ let
     "ghc94"
     "ghc96"
     "ghc962"
+    "ghc963"
     "ghcHEAD"
   ];
 
@@ -47,6 +48,7 @@ let
     "ghc946"
     "ghc96"
     "ghc962"
+    "ghc963"
     "ghcHEAD"
   ];
 
@@ -350,7 +352,25 @@ in {
       buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
       llvmPackages = pkgs.llvmPackages_15;
     };
-    ghc96 = compiler.ghc962;
+    ghc963 = callPackage ../development/compilers/ghc/9.6.3.nix {
+      bootPkgs =
+        # 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
+          packages.ghc924
+        else
+          packages.ghc924Binary;
+      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 >= 11 && < 16
+      buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
+      llvmPackages = pkgs.llvmPackages_15;
+    };
+    ghc96 = compiler.ghc963;
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
       bootPkgs =
         # For GHC 9.2 no armv7l bindists are available.
@@ -503,7 +523,12 @@ in {
       ghc = bh.compiler.ghc962;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { };
     };
-    ghc96 = packages.ghc962;
+    ghc963 = callPackage ../development/haskell-modules {
+      buildHaskellPackages = bh.packages.ghc963;
+      ghc = bh.compiler.ghc963;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { };
+    };
+    ghc96 = packages.ghc963;
     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 3365032f418..3f242545382 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -71,6 +71,7 @@ let
     ghc945
     ghc946
     ghc962
+    ghc963
   ];
 
   # packagePlatforms applied to `haskell.packages.*`
@@ -493,9 +494,11 @@ let
       ] released;
       hoogle = lib.subtractLists [
         compilerNames.ghc962
+        compilerNames.ghc963
       ] released;
       hlint = lib.subtractLists [
         compilerNames.ghc962
+        compilerNames.ghc963
       ] released;
       hpack = released;
       hsdns = released;
@@ -537,6 +540,7 @@ let
         compilerNames.ghc945
         compilerNames.ghc946
         compilerNames.ghc962
+        compilerNames.ghc963
       ];
       hashable = released;
       primitive = released;
@@ -551,6 +555,7 @@ let
         compilerNames.ghc945
         compilerNames.ghc946
         compilerNames.ghc962
+        compilerNames.ghc963
       ];
     })
     {
-- 
cgit 1.4.1