all-cabal-hashes: 2022-03-03T10:08:52Z -> 2022-03-08T11:03:28Z

* Regenerate package set

* Adjust overrides for upgrades of ghc-lib* and Cabal.
This commit is contained in:
sternenseemann 2022-03-08 13:45:33 +01:00
parent a01d73f1a6
commit 33f275b4c2
8 changed files with 659 additions and 192 deletions

View File

@ -1,6 +1,6 @@
{ {
"commit": "d45fb22e43fbb32aa7653d0f2e0fd31fecfff2e4", "commit": "af438cb53d095726a82a4d65b5f45a8e68d2c1c9",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d45fb22e43fbb32aa7653d0f2e0fd31fecfff2e4.tar.gz", "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/af438cb53d095726a82a4d65b5f45a8e68d2c1c9.tar.gz",
"sha256": "1ydd1xvhzavpym9g4ywzjg50pl40nkn9j9i06dbci8xradds9n66", "sha256": "0br69wqnpshi6760zjqcl24hq62jvn5mc436vznmzh1qpfx69rk9",
"msg": "Update from Hackage at 2022-03-03T10:08:52Z" "msg": "Update from Hackage at 2022-03-08T11:03:28Z"
} }

View File

@ -1972,7 +1972,7 @@ self: super: {
# 2022-01-16 haskell-ci needs Cabal 3.6, ShellCheck 0.7.2 # 2022-01-16 haskell-ci needs Cabal 3.6, ShellCheck 0.7.2
haskell-ci = super.haskell-ci.overrideScope (self: super: { haskell-ci = super.haskell-ci.overrideScope (self: super: {
Cabal = self.Cabal_3_6_2_0; Cabal = self.Cabal_3_6_3_0;
ShellCheck = self.ShellCheck_0_7_2; ShellCheck = self.ShellCheck_0_7_2;
}); });
@ -2077,7 +2077,7 @@ self: super: {
# 2021-11-05: jailBreak the too tight upper bound on haskus-utils-variant # 2021-11-05: jailBreak the too tight upper bound on haskus-utils-variant
ghcup = doJailbreak (super.ghcup.overrideScope (self: super: { ghcup = doJailbreak (super.ghcup.overrideScope (self: super: {
Cabal = self.Cabal_3_6_2_0; Cabal = self.Cabal_3_6_3_0;
})); }));
# Break out of "Cabal < 3.2" constraint. # Break out of "Cabal < 3.2" constraint.
@ -2108,7 +2108,7 @@ self: super: {
# Needs Cabal >= 3.4 # Needs Cabal >= 3.4
chs-cabal = super.chs-cabal.override { chs-cabal = super.chs-cabal.override {
Cabal = self.Cabal_3_6_2_0; Cabal = self.Cabal_3_6_3_0;
}; };
# 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too. # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too.

View File

@ -43,11 +43,11 @@ self: super: {
# cabal-install needs more recent versions of Cabal and base16-bytestring. # cabal-install needs more recent versions of Cabal and base16-bytestring.
cabal-install = super.cabal-install.overrideScope (self: super: { cabal-install = super.cabal-install.overrideScope (self: super: {
Cabal = self.Cabal_3_6_2_0; Cabal = self.Cabal_3_6_3_0;
}); });
# cabal-install-parsers is written for Cabal 3.6 # cabal-install-parsers is written for Cabal 3.6
cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_2_0; }; cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_3_0; };
# Pick right versions for GHC-specific packages # Pick right versions for GHC-specific packages
ghc-api-compat = doDistribute self.ghc-api-compat_8_10_7; ghc-api-compat = doDistribute self.ghc-api-compat_8_10_7;

View File

@ -50,7 +50,7 @@ self: super: {
# cabal-install needs more recent versions of Cabal and random, but an older # cabal-install needs more recent versions of Cabal and random, but an older
# version of base16-bytestring. # version of base16-bytestring.
cabal-install = super.cabal-install.overrideScope (self: super: { cabal-install = super.cabal-install.overrideScope (self: super: {
Cabal = self.Cabal_3_6_2_0; Cabal = self.Cabal_3_6_3_0;
}); });
# Ignore overly restrictive upper version bounds. # Ignore overly restrictive upper version bounds.
@ -97,7 +97,7 @@ self: super: {
darcs = dontDistribute super.darcs; darcs = dontDistribute super.darcs;
# The package needs the latest Cabal version. # The package needs the latest Cabal version.
cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_6_2_0; }); cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_6_3_0; });
# cabal-fmt requires Cabal3 # cabal-fmt requires Cabal3
cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_1_0; }; cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_1_0; };

View File

@ -44,7 +44,7 @@ self: super: {
# cabal-install needs more recent versions of Cabal and base16-bytestring. # cabal-install needs more recent versions of Cabal and base16-bytestring.
cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: {
Cabal = self.Cabal_3_6_2_0; Cabal = self.Cabal_3_6_3_0;
}); });
# Jailbreaks & Version Updates # Jailbreaks & Version Updates

View File

@ -57,7 +57,7 @@ self: super: {
# cabal-install needs more recent versions of Cabal # cabal-install needs more recent versions of Cabal
cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: {
Cabal = self.Cabal_3_6_2_0; Cabal = self.Cabal_3_6_3_0;
}); });
doctest = dontCheck (doJailbreak super.doctest); doctest = dontCheck (doJailbreak super.doctest);
@ -100,9 +100,9 @@ self: super: {
self.data-default self.data-default
] ++ drv.libraryHaskellDepends or []; ] ++ drv.libraryHaskellDepends or [];
}) super.ghc-exactprint; }) super.ghc-exactprint;
ghc-lib = self.ghc-lib_9_2_1_20220109; ghc-lib = self.ghc-lib_9_2_2_20220307;
ghc-lib-parser = self.ghc-lib-parser_9_2_1_20220109; ghc-lib-parser = self.ghc-lib-parser_9_2_2_20220307;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_1; ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_2;
hackage-security = doJailbreak super.hackage-security; hackage-security = doJailbreak super.hackage-security;
hashable = super.hashable_1_4_0_2; hashable = super.hashable_1_4_0_2;
hashable-time = doJailbreak super.hashable-time; hashable-time = doJailbreak super.hashable-time;

File diff suppressed because it is too large Load Diff

View File

@ -316,7 +316,7 @@ let
# package sets (like Cabal, jailbreak-cabal) are # package sets (like Cabal, jailbreak-cabal) are
# working as expected. # working as expected.
cabal-install = released; cabal-install = released;
Cabal_3_6_2_0 = released; Cabal_3_6_3_0 = released;
cabal2nix = released; cabal2nix = released;
cabal2nix-unstable = released; cabal2nix-unstable = released;
funcmp = released; funcmp = released;