From 2ea0fc9b6f7c548af63eeca3bdf55433c560f266 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 19 Jul 2024 22:12:08 +0200 Subject: [PATCH] haskellPackages: adjust to Cabal 3.12.0.0 -> 3.12.1.0 --- .../haskell-modules/configuration-common.nix | 4 ++-- pkgs/top-level/release-haskell.nix | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 86ebbb599290..5d742679fb97 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -27,8 +27,8 @@ self: super: { process = self.process_1_6_20_0; })); - Cabal_3_12_0_0 = doDistribute (super.Cabal_3_12_0_0.override ({ - Cabal-syntax = self.Cabal-syntax_3_12_0_0; + Cabal_3_12_1_0 = doDistribute (super.Cabal_3_12_1_0.override ({ + Cabal-syntax = self.Cabal-syntax_3_12_1_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # Use process core package when possible process = self.process_1_6_20_0; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 62fedeead0f6..2b5e27bd5460 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -514,12 +514,10 @@ let cabal-install = lib.subtractLists [ compilerNames.ghc9101 ] released; - Cabal_3_10_3_0 = lib.subtractLists [ - compilerNames.ghc9101 - ] released; - Cabal-syntax_3_10_3_0 = lib.subtractLists [ - compilerNames.ghc9101 - ] released; + Cabal_3_10_3_0 = released; + Cabal-syntax_3_10_3_0 = released; + Cabal_3_12_1_0 = released; + Cabal-syntax_3_12_1_0 = released; cabal2nix = lib.subtractLists [ compilerNames.ghc9101 ] released;