summary refs log tree commit diff
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2023-05-30 13:42:03 +0200
committersternenseemann <sternenseemann@systemli.org>2023-05-31 11:06:33 +0200
commitf789a17825396ff2cc7713344b0db86672a51910 (patch)
tree7ff9480a2564083f7abb998f47c4d35a357be874
parentcdfdc7a73d6eed67f28e2dff053d055bd8b037fb (diff)
haskell.compiler.ghc96: 9.6.1 -> 9.6.2
-rw-r--r--pkgs/top-level/haskell-packages.nix4
-rw-r--r--pkgs/top-level/release-haskell.nix8
2 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0529d415c98e4..23648b58cfa5e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -371,7 +371,7 @@ in {
       buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
       llvmPackages = pkgs.llvmPackages_15;
     };
-    ghc96 = ghc961;
+    ghc96 = ghc962;
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
       bootPkgs =
         # For GHC 9.2 no armv7l bindists are available.
@@ -539,7 +539,7 @@ in {
       ghc = bh.compiler.ghc962;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { };
     };
-    ghc96 = ghc961;
+    ghc96 = ghc962;
     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 cc8c1b24640bd..82968a342d8f8 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -69,6 +69,7 @@ let
     ghc927
     ghc945
     ghc961
+    ghc962
   ];
 
   # packagePlatforms applied to `haskell.packages.*`
@@ -487,12 +488,15 @@ let
       Cabal-syntax_3_10_1_0 = released;
       cabal2nix = lib.subtractLists [
         compilerNames.ghc961
+        compilerNames.ghc962
       ] released;
       cabal2nix-unstable = lib.subtractLists [
         compilerNames.ghc961
+        compilerNames.ghc962
       ] released;
       funcmp = lib.subtractLists [
         compilerNames.ghc961
+        compilerNames.ghc962
       ] released;
       haskell-language-server = lib.subtractLists [
         # Support ceased as of 1.9.0.0
@@ -500,17 +504,21 @@ let
       ] released;
       hoogle = lib.subtractLists [
         compilerNames.ghc961
+        compilerNames.ghc962
       ] released;
       hlint = lib.subtractLists [
         compilerNames.ghc961
+        compilerNames.ghc962
       ] released;
       hpack = lib.subtractLists [
         compilerNames.ghc961
+        compilerNames.ghc962
       ] released;
       hsdns = released;
       jailbreak-cabal = released;
       language-nix = lib.subtractLists [
         compilerNames.ghc961
+        compilerNames.ghc962
       ] released;
       nix-paths = released;
       titlecase = released;