From 9d886b026546ede5ff40c6e09d2f6161c8fb1269 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 30 May 2023 13:42:03 +0200 Subject: [PATCH] haskell.compiler.ghc96: 9.6.1 -> 9.6.2 --- pkgs/top-level/haskell-packages.nix | 4 ++-- pkgs/top-level/release-haskell.nix | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 95362f84528..6001039689c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -390,7 +390,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. @@ -563,7 +563,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 5a16c97f7c5..09087a3c73e 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -70,6 +70,7 @@ let ghc928 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;