movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

haskellPackages: Cabal* 3.14.1.* -> 3.14.2.0

Browse source
This commit is contained in:
sternenseemann 2025-04-22 16:16:18 +02:00
parent 6de45ff9a5
commit 88de1ef84a
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/languages-frameworks/haskell.section.md
View file

@ -779,7 +779,7 @@ that depend on that library, you may want to use:
```nix ```nix
haskellPackages.haskell-ci.overrideScope (self: super: { haskellPackages.haskell-ci.overrideScope (self: super: {
Cabal = self.Cabal_3_14_1_1; Cabal = self.Cabal_3_14_2_0;
}) })
``` ```

12
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -34,7 +34,7 @@ self: super:
Cabal-syntax = self.Cabal-syntax_3_12_1_0; Cabal-syntax = self.Cabal-syntax_3_12_1_0;
} }
); );
Cabal_3_14_1_1 = Cabal_3_14_2_0 =
overrideCabal overrideCabal
(drv: { (drv: {
# Revert increased lower bound on unix since we have backported # Revert increased lower bound on unix since we have backported
@ -47,15 +47,15 @@ self: super:
}) })
( (
doDistribute ( doDistribute (
super.Cabal_3_14_1_1.override { super.Cabal_3_14_2_0.override {
Cabal-syntax = self.Cabal-syntax_3_14_1_0; Cabal-syntax = self.Cabal-syntax_3_14_2_0;
} }
) )
); );
# Needs matching version of Cabal # Needs matching version of Cabal
Cabal-hooks = super.Cabal-hooks.override { 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, # cabal-install needs most recent versions of Cabal and Cabal-syntax,
@ -67,8 +67,8 @@ self: super:
cabalInstallOverlay = cabalInstallOverlay =
cself: csuper: cself: csuper:
lib.optionalAttrs (lib.versionOlder self.ghc.version "9.12") { lib.optionalAttrs (lib.versionOlder self.ghc.version "9.12") {
Cabal = cself.Cabal_3_14_1_1; Cabal = cself.Cabal_3_14_2_0;
Cabal-syntax = cself.Cabal-syntax_3_14_1_0; Cabal-syntax = cself.Cabal-syntax_3_14_2_0;
}; };
in in
{ {

2
pkgs/development/tools/haskell/hadrian/make-hadrian.nix
View file

@ -64,6 +64,6 @@ callPackage' ./hadrian.nix (
} }
// lib.optionalAttrs (lib.versionAtLeast ghcVersion "9.11") { // lib.optionalAttrs (lib.versionAtLeast ghcVersion "9.11") {
# See https://gitlab.haskell.org/ghc/ghc/-/commit/145a6477854d4003a07573d5e7ffa0c9a64ae29c # See https://gitlab.haskell.org/ghc/ghc/-/commit/145a6477854d4003a07573d5e7ffa0c9a64ae29c
Cabal = bootPkgs.Cabal_3_14_1_1; Cabal = bootPkgs.Cabal_3_14_2_0;
} }
) )

2
pkgs/top-level/release-haskell.nix
View file

@ -574,7 +574,7 @@ let
compilerNames.ghc9122 compilerNames.ghc9122
] released; ] released;
Cabal_3_12_1_0 = released; Cabal_3_12_1_0 = released;
Cabal_3_14_1_1 = released; Cabal_3_14_2_0 = released;
cabal2nix = released; cabal2nix = released;
cabal2nix-unstable = released; cabal2nix-unstable = released;
funcmp = released; funcmp = released;