summary refs log tree commit diff
diff options
context:
space:
mode:
authorners <ners@gmx.ch>2023-05-26 09:47:26 +0200
committersternenseemann <sternenseemann@systemli.org>2023-05-31 11:06:33 +0200
commitcdfdc7a73d6eed67f28e2dff053d055bd8b037fb (patch)
treef83bb7b34b6ab94e3654ddc957945f145a40b911
parenteb592ef8bb7a90d51903f149fd379d4d81e86ecf (diff)
haskell.compiler.ghc962: init at 9.6.2
https://www.haskell.org/ghc/blog/20230523-ghc-9.6.2-released.html
(cherry picked from commit 08f19f55206a7bc3d68853a3ede53dffaed1b42e)
-rw-r--r--pkgs/development/compilers/ghc/9.6.2.nix4
-rw-r--r--pkgs/top-level/haskell-packages.nix27
2 files changed, 31 insertions, 0 deletions
diff --git a/pkgs/development/compilers/ghc/9.6.2.nix b/pkgs/development/compilers/ghc/9.6.2.nix
new file mode 100644
index 0000000000000..a0f764d016b56
--- /dev/null
+++ b/pkgs/development/compilers/ghc/9.6.2.nix
@@ -0,0 +1,4 @@
+import ./common-hadrian.nix rec {
+  version = "9.6.2";
+  sha256 = "1b510c5f8753c3ba24851702c6c9da7d81dc5e47fe3ecb7af39c7c2613abf170";
+}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3ed35bf460597..0529d415c98e4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -28,6 +28,7 @@ let
     "ghc94"
     "ghc96"
     "ghc961"
+    "ghc962"
     "ghcHEAD"
   ];
 
@@ -46,6 +47,7 @@ let
     "ghc945"
     "ghc96"
     "ghc961"
+    "ghc962"
     "ghcHEAD"
   ];
 
@@ -349,6 +351,26 @@ in {
       buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_14;
       llvmPackages = pkgs.llvmPackages_14;
     };
+    ghc962 = callPackage ../development/compilers/ghc/9.6.2.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 if stdenv.isAarch64 then
+          packages.ghc924BinaryMinimal
+        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 = ghc961;
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
       bootPkgs =
@@ -512,6 +534,11 @@ in {
       ghc = bh.compiler.ghc961;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { };
     };
+    ghc962 = callPackage ../development/haskell-modules {
+      buildHaskellPackages = bh.packages.ghc962;
+      ghc = bh.compiler.ghc962;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { };
+    };
     ghc96 = ghc961;
     ghcHEAD = callPackage ../development/haskell-modules {
       buildHaskellPackages = bh.packages.ghcHEAD;