Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[haskell-updates] bump again to latest LTS 22 #363650

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/languages-frameworks/haskell.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -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;
})
```

Expand Down
2 changes: 1 addition & 1 deletion maintainers/scripts/haskell/update-stackage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set -eu -o pipefail
# (should be capitalized like the display name)
SOLVER=LTS
# Stackage solver verson, if any. Use latest if empty
VERSION=
VERSION=22
TMP_TEMPLATE=update-stackage.XXXXXXX
readonly SOLVER
readonly VERSION
Expand Down
8 changes: 4 additions & 4 deletions pkgs/data/misc/hackage/pin.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"commit": "11b47ef0c5fa2ddecc20a556776ede00e9569867",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/11b47ef0c5fa2ddecc20a556776ede00e9569867.tar.gz",
"sha256": "17k59rkyrz1ax8gx8jps295371p25ksscli9jbp3h4ivfmls5fyd",
"msg": "Update from Hackage at 2024-11-07T13:09:31Z"
"commit": "c9ce1cc4a029220ec3582fbcf69e082d245d78b6",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c9ce1cc4a029220ec3582fbcf69e082d245d78b6.tar.gz",
"sha256": "02x3z4rg4dwarzb6p88z7sff40bkbq41gxnczvzph8s3s8jq9iw1",
"msg": "Update from Hackage at 2024-12-23T18:27:47Z"
}
34 changes: 17 additions & 17 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ 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
# makes sense to use the non Stackage version if we want to use Cabal* >= 3.12
# makes sense to use the non Stackage version if we want to use Cabal* >= 3.14
hackage-security_0_6_2_6 = super.hackage-security_0_6_2_6.override {
Cabal = self.Cabal_3_12_1_0;
Cabal-syntax = self.Cabal-syntax_3_12_1_0;
Cabal = self.Cabal_3_14_1_0;
Cabal-syntax = self.Cabal-syntax_3_14_1_0;
};

# cabal-install needs most recent versions of Cabal and Cabal-syntax,
Expand All @@ -48,9 +48,9 @@ self: super: {
cabalInstallOverlay = cself: csuper:
{
hackage-security = self.hackage-security_0_6_2_6;
} // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.10.2") {
Cabal = cself.Cabal_3_12_1_0;
Cabal-syntax = cself.Cabal-syntax_3_12_1_0;
} // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.12") {
Cabal = cself.Cabal_3_14_1_0;
Cabal-syntax = cself.Cabal-syntax_3_14_1_0;
};
in
{
Expand Down Expand Up @@ -169,7 +169,7 @@ self: super: {
# jacinda needs latest version of alex and happy
jacinda = super.jacinda.override {
alex = self.alex_3_5_1_0;
happy = self.happy_2_1_2;
happy = self.happy_2_1_3;
};

# 2024-07-09: rhine 1.4.* needs newer monad-schedule than stackage (and is only consumer)
Expand Down Expand Up @@ -1966,18 +1966,18 @@ self: super: {

# Pandoc 3.5 improves the quality of PDF rendering in Quarto >=1.6.30.
# https://github.com/NixOS/nixpkgs/pull/349683
pandoc-cli_3_5 = super.pandoc-cli_3_5.overrideScope (
pandoc-cli_3_6 = super.pandoc-cli_3_6.overrideScope (
self: super: {
doclayout = self.doclayout_0_5;
hslua-module-doclayout = self.hslua-module-doclayout_1_2_0;
lpeg = self.lpeg_1_1_0;
pandoc = self.pandoc_3_5;
pandoc-lua-engine = self.pandoc-lua-engine_0_3_3;
pandoc-server = self.pandoc-server_0_1_0_9;
texmath = self.texmath_0_12_8_11;
pandoc = self.pandoc_3_6;
pandoc-lua-engine = self.pandoc-lua-engine_0_4;
pandoc-server = self.pandoc-server_0_1_0_10;
texmath = self.texmath_0_12_8_12;
tls = self.tls_2_0_6;
toml-parser = self.toml-parser_2_0_1_0;
typst = self.typst_0_6;
typst = self.typst_0_6_1;
typst-symbols = self.typst-symbols_0_1_6;
}
);
Expand Down Expand Up @@ -2237,8 +2237,8 @@ self: super: {
}) super.gi-gtk-declarative;
gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple;

gi-gtk_4 = self.gi-gtk_4_0_9;
gi-gtk_4_0_9 = doDistribute (super.gi-gtk_4_0_9.override {
gi-gtk_4 = self.gi-gtk_4_0_11;
gi-gtk_4_0_11 = doDistribute (super.gi-gtk_4_0_11.override {
gi-gdk = self.gi-gdk_4;
});
gi-gdk_4 = self.gi-gdk_4_0_9;
Expand Down
10 changes: 5 additions & 5 deletions pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ self: super: {
# already made the relevant changes.
aeson = doDistribute self.aeson_2_2_3_0;
attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_2_0;
auto-update = super.auto-update_0_2_2;
auto-update = doDistribute self.auto-update_0_2_6;
dependent-sum-template = doJailbreak self.dependent-sum-template_0_2_0_1; # template-haskell < 2.22
extensions = doDistribute self.extensions_0_1_0_2;
fourmolu = doDistribute self.fourmolu_0_16_2_0;
hashable = doDistribute self.hashable_1_4_7_0;
integer-conversion = doDistribute self.integer-conversion_0_1_1;
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_10_1_20241103;
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_10_0_0;
http2 = doDistribute self.http2_5_3_5;
http2 = doDistribute self.http2_5_3_9;
http-semantics = doDistribute self.http-semantics_0_3_0;
lens = doDistribute self.lens_5_3_2;
lukko = doDistribute self.lukko_0_1_2;
Expand All @@ -83,10 +83,10 @@ self: super: {
rerebase = doDistribute self.rerebase_1_21_1;
scientific = doDistribute self.scientific_0_3_8_0;
semirings = doDistribute self.semirings_0_7;
time-manager = super.time-manager_0_1_1;
th-abstraction = doDistribute self.th-abstraction_0_7_0_0;
time-manager = doDistribute self.time-manager_0_2_2;
th-abstraction = doDistribute self.th-abstraction_0_7_1_0;
uuid-types = doDistribute self.uuid-types_1_0_6;
warp = pkgs.haskell.lib.dontCheck super.warp_3_4_4; # test suite assumes it can freely call curl
warp = pkgs.haskell.lib.dontCheck super.warp_3_4_7; # test suite assumes it can freely call curl

# A given major version of ghc-exactprint only supports one version of GHC.
ghc-exactprint = doDistribute self.ghc-exactprint_1_9_0_0;
Expand Down
8 changes: 4 additions & 4 deletions pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ self: super: {
#
# Version upgrades
#
th-abstraction = doDistribute self.th-abstraction_0_7_0_0;
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_3_20241103;
th-abstraction = doDistribute self.th-abstraction_0_7_1_0;
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_4_20241130;
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2;
ghc-lib = doDistribute self.ghc-lib_9_8_3_20241103;
megaparsec = doDistribute self.megaparsec_9_6_1;
ghc-lib = doDistribute self.ghc-lib_9_8_4_20241130;
megaparsec = doDistribute self.megaparsec_9_7_0;
# aeson 2.2.3.0 seemingly unnecessesarily bumped the lower bound on hashable
# https://github.com/haskell/aeson/commit/1a666febd0775d8e88d315ece1b97cd20602fb5f
aeson = doJailbreak (doDistribute self.aeson_2_2_3_0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ extra-packages:
- ghc-lib == 9.8.* # 2024-05-19: preserve for GHC 9.8
- ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 8.10, 9.0
- ghc-lib-parser == 9.8.* # 2024-05-19: preserve for GHC 9.8
- ghc-lib-parser == 9.10.* # 2024-12-26: preserve for ghc-syntax-highlighter == 0.0.12.0
- ghc-lib-parser-ex == 9.10.* # 2024-12-26: preserve for 9.10 HLS
- ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 8.10, 9.0
- ghc-lib-parser-ex == 9.8.* # 2024-05-19: preserve for GHC 9.8
- happy == 1.19.12 # for ghcjs
Expand Down
Loading
Loading