From 0bbb00e8ee21bcefbaa3ddee70da521020b4945e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 24 Dec 2024 14:41:09 +0100 Subject: [PATCH] haskellPackages: use Cabal 3.14.1.0 over 3.14.0.0 --- doc/languages-frameworks/haskell.section.md | 2 +- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- pkgs/development/tools/haskell/hadrian/make-hadrian.nix | 2 +- pkgs/top-level/release-haskell.nix | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 78a313916dbc..9ad32a3d20fb 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -764,7 +764,7 @@ that depend on that library, you may want to use: ```nix haskellPackages.haskell-ci.overrideScope (self: super: { - Cabal = self.Cabal_3_14_0_0; + Cabal = self.Cabal_3_14_1_0; }) ``` diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1092591c4865..599889976013 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -29,8 +29,8 @@ self: super: { Cabal_3_12_1_0 = doDistribute (super.Cabal_3_12_1_0.override { Cabal-syntax = self.Cabal-syntax_3_12_1_0; }); - Cabal_3_14_0_0 = doDistribute (super.Cabal_3_14_0_0.override { - Cabal-syntax = self.Cabal-syntax_3_14_0_0; + Cabal_3_14_1_0 = doDistribute (super.Cabal_3_14_1_0.override { + Cabal-syntax = self.Cabal-syntax_3_14_1_0; }); # hackage-security == 0.6.2.6 has a wider support range in theory, but it only diff --git a/pkgs/development/tools/haskell/hadrian/make-hadrian.nix b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix index 463d485e242e..242ca5c914f9 100644 --- a/pkgs/development/tools/haskell/hadrian/make-hadrian.nix +++ b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix @@ -64,6 +64,6 @@ callPackage' ./hadrian.nix ( } // lib.optionalAttrs (lib.versionAtLeast ghcVersion "9.11") { # See https://gitlab.haskell.org/ghc/ghc/-/commit/145a6477854d4003a07573d5e7ffa0c9a64ae29c - Cabal = bootPkgs.Cabal_3_14_0_0; + Cabal = bootPkgs.Cabal_3_14_1_0; } ) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 7f4ffc757c93..5c98e69ae83f 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -563,7 +563,7 @@ let ] released; Cabal_3_10_3_0 = released; Cabal_3_12_1_0 = released; - Cabal_3_14_0_0 = released; + Cabal_3_14_1_0 = released; cabal2nix = lib.subtractLists [ compilerNames.ghc9101 ] released;