cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

haskellPackages: Fixup Cabal minor version in overrides

Browse source
This commit is contained in:
Robert Hensing 2023-11-10 18:30:19 +01:00
parent ea71c45d76
commit 22cf6681f6
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@ with haskellLib;
self: super: { self: super: {
# Make sure that Cabal 3.10.* can be built as-is # Make sure that Cabal 3.10.* can be built as-is
Cabal_3_10_2_0 = doDistribute (super.Cabal_3_10_2_0.override ({ Cabal_3_10_2_1 = doDistribute (super.Cabal_3_10_2_1.override ({
Cabal-syntax = self.Cabal-syntax_3_10_2_0; Cabal-syntax = self.Cabal-syntax_3_10_2_0;
} // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") {
# Use process core package when possible # Use process core package when possible
@ -39,7 +39,7 @@ self: super: {
# Needs to be downgraded compared to Stackage LTS 21 # Needs to be downgraded compared to Stackage LTS 21
resolv = cself.resolv_0_1_2_0; resolv = cself.resolv_0_1_2_0;
} // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.6") { } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.6") {
Cabal = cself.Cabal_3_10_2_0; Cabal = cself.Cabal_3_10_2_1;
Cabal-syntax = cself.Cabal-syntax_3_10_2_0; Cabal-syntax = cself.Cabal-syntax_3_10_2_0;
} // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.4") { } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.4") {
# We need at least directory >= 1.3.7.0. Using the latest version # We need at least directory >= 1.3.7.0. Using the latest version

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

@ -487,7 +487,7 @@ let
cabal-install = lib.subtractLists [ cabal-install = lib.subtractLists [
compilerNames.ghc981 compilerNames.ghc981
] released; ] released;
Cabal_3_10_2_0 = lib.subtractLists [ Cabal_3_10_2_1 = lib.subtractLists [
compilerNames.ghc981 compilerNames.ghc981
] released; ] released;
Cabal-syntax_3_10_1_0 = lib.subtractLists [ Cabal-syntax_3_10_1_0 = lib.subtractLists [