diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 3cc16936f3c4..0e0d44114971 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -779,7 +779,7 @@ that depend on that library, you may want to use: ```nix haskellPackages.haskell-ci.overrideScope (self: super: { - Cabal = self.Cabal_3_14_1_1; + Cabal = self.Cabal_3_14_2_0; }) ``` diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f17fd3cd1cfb..9651d38585ca 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -34,7 +34,7 @@ self: super: Cabal-syntax = self.Cabal-syntax_3_12_1_0; } ); - Cabal_3_14_1_1 = + Cabal_3_14_2_0 = overrideCabal (drv: { # Revert increased lower bound on unix since we have backported @@ -47,15 +47,15 @@ self: super: }) ( doDistribute ( - super.Cabal_3_14_1_1.override { - Cabal-syntax = self.Cabal-syntax_3_14_1_0; + super.Cabal_3_14_2_0.override { + Cabal-syntax = self.Cabal-syntax_3_14_2_0; } ) ); # Needs matching version of Cabal Cabal-hooks = super.Cabal-hooks.override { - Cabal = self.Cabal_3_14_1_1; + Cabal = self.Cabal_3_14_2_0; }; # cabal-install needs most recent versions of Cabal and Cabal-syntax, @@ -67,8 +67,8 @@ self: super: cabalInstallOverlay = cself: csuper: lib.optionalAttrs (lib.versionOlder self.ghc.version "9.12") { - Cabal = cself.Cabal_3_14_1_1; - Cabal-syntax = cself.Cabal-syntax_3_14_1_0; + Cabal = cself.Cabal_3_14_2_0; + Cabal-syntax = cself.Cabal-syntax_3_14_2_0; }; in { diff --git a/pkgs/development/tools/haskell/hadrian/make-hadrian.nix b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix index 6e668e9a6914..d2463865c199 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_1_1; + Cabal = bootPkgs.Cabal_3_14_2_0; } ) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index ab2f2a23916d..fe3926e46d3c 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -574,7 +574,7 @@ let compilerNames.ghc9122 ] released; Cabal_3_12_1_0 = released; - Cabal_3_14_1_1 = released; + Cabal_3_14_2_0 = released; cabal2nix = released; cabal2nix-unstable = released; funcmp = released;