From f1cd9a2136c2e8145cadfa01af225325042941d7 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 8 Jul 2025 20:02:37 +0200 Subject: [PATCH] chore: stackage 22.44 -> 23.28 This updates stackage builds to GHC 9.8.4. --- .github/workflows/build.yaml | 2 +- postgrest.cabal | 2 +- stack.yaml | 16 ++++++++--- stack.yaml.lock | 52 +++++++++++++++++++++++++++--------- 4 files changed, 54 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b20cc4340..00937cdc3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -121,7 +121,7 @@ jobs: - uses: haskell-actions/setup@cd0d9bdd65b20557f41bea4dbe43d0b5fbbfe553 # v2.11.0 with: # This must match the version in stack.yaml's resolver - ghc-version: 9.6.7 + ghc-version: 9.8.4 enable-stack: true stack-no-global: true stack-setup-ghc: true diff --git a/postgrest.cabal b/postgrest.cabal index 35b18f5a6..097293758 100644 --- a/postgrest.cabal +++ b/postgrest.cabal @@ -19,9 +19,9 @@ tested-with: -- nix GHC == 9.4.8 -- cabal on Ubuntu - -- stack on FreeBSD, MacOS, Ubuntu, Windows , GHC == 9.6.7 -- cabal on Ubuntu + -- stack on FreeBSD, MacOS, Ubuntu, Windows , GHC == 9.8.4 source-repository head diff --git a/stack.yaml b/stack.yaml index c88035cee..fc4fa88dc 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-22.44 # 2025-05-02, GHC 9.6.7 +resolver: lts-23.28 # 2025-08-17, GHC 9.8.4 nix: packages: @@ -11,10 +11,18 @@ nix: extra-deps: - configurator-pg-0.2.11 - fuzzyset-0.2.4 + - hasql-1.6.4.4 + - hasql-dynamic-statements-0.3.1.5 + - hasql-implicits-0.1.1.3 + - hasql-notifications-0.2.2.2 - hasql-pool-1.0.1 - - jose-jwt-0.10.0 - - postgresql-libpq-0.10.1.0 + - hasql-transaction-1.1.0.1 + - postgresql-binary-0.13.1.3 - streaming-commons-0.2.3.1 - # fix build with GCC 15-ish; https://github.com/gregorycollins/hashtables/issues/98 for details - hashtables-1.4.2@sha256:4940cab94a15d469845ccf5225f9cb3d354c15e8127ebb58425c8b681f7721d9,10386 + +allow-newer: true +allow-newer-deps: + - fuzzyset + - hasql diff --git a/stack.yaml.lock b/stack.yaml.lock index ae2cbfd7c..e28d79592 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -18,6 +18,34 @@ packages: size: 574 original: hackage: fuzzyset-0.2.4 +- completed: + hackage: hasql-1.6.4.4@sha256:a26b346aaf33b903f011f8c47a1a1230ea2b0aa1d8325aaf779da425d6c076c5,4391 + pantry-tree: + sha256: 120edb520584aa107998b49a7809fa70a1ad4648a9cae26d3b031cfe15bce18e + size: 2607 + original: + hackage: hasql-1.6.4.4 +- completed: + hackage: hasql-dynamic-statements-0.3.1.5@sha256:2455a5fdd8cc6458a6fa66cbca8a01d25011e16c405e36b0c6d75fc39b15477f,2961 + pantry-tree: + sha256: f4fe881d367499a03290028180fdcb76be050807d1e13effeec6c78ab23b481a + size: 595 + original: + hackage: hasql-dynamic-statements-0.3.1.5 +- completed: + hackage: hasql-implicits-0.1.1.3@sha256:7a46264113765b0080de33560b22e13d4dfe811ce20e9e805fe600f30a0d418a,1334 + pantry-tree: + sha256: 51278386de1d497546c1b1baabefaf16a63c30cb00dd8f1e8a9dc74291db9aac + size: 264 + original: + hackage: hasql-implicits-0.1.1.3 +- completed: + hackage: hasql-notifications-0.2.2.2@sha256:d1d6bc0d3ee5e418fc12ea023b78739e0decba6c34e2b43bec55b89e18bd4412,2025 + pantry-tree: + sha256: 83a9cbb179b1efd0b2acd6509583c7afcdbe63469ab033d8581d48d675a80b44 + size: 452 + original: + hackage: hasql-notifications-0.2.2.2 - completed: hackage: hasql-pool-1.0.1@sha256:3cfb4c7153a6c536ac7e126c17723e6d26ee03794954deed2d72bcc826d05a40,2302 pantry-tree: @@ -26,19 +54,19 @@ packages: original: hackage: hasql-pool-1.0.1 - completed: - hackage: jose-jwt-0.10.0@sha256:6ed175a01c721e317ceea15eb251a81de145c03711a977517935633a5cdec1d4,3546 + hackage: hasql-transaction-1.1.0.1@sha256:ca451ad29d2195d9e59e9118ab1b210887fea15383fa175895bba711e92b1d00,3302 pantry-tree: - sha256: 58649e68e2d1adb47d8ed8741bd27ac23a2f19e3ee62bc28a68ac8642b3e0858 - size: 1231 + sha256: b0435127264b8f40c11e0474d7c208f40278acd470fa2368ba2c6cda3a4f7ced + size: 1027 original: - hackage: jose-jwt-0.10.0 + hackage: hasql-transaction-1.1.0.1 - completed: - hackage: postgresql-libpq-0.10.1.0@sha256:6b580c9d5068e78eecc13e655b2885c8e79cdacfca513c5d1e5a6b9dc61d9758,3166 + hackage: postgresql-binary-0.13.1.3@sha256:4de5ddc90d9d3e586c3edf2860280a0915a484e9b8de3f36316a4cab2b330852,4037 pantry-tree: - sha256: ae81e7628a8f3d1ef33ace71fa0845c073c003ca7f1150cc9d9ba1e55fc84236 - size: 1096 + sha256: a5e9a06511b2a6a5be2388a4874d3c62babcfe1165b876e425bcc819b0474cde + size: 1661 original: - hackage: postgresql-libpq-0.10.1.0 + hackage: postgresql-binary-0.13.1.3 - completed: hackage: streaming-commons-0.2.3.1@sha256:ed7999fea9e912b1211ea93d7e20a7998bf4753166370c94048885650f303bf0,4841 pantry-tree: @@ -55,7 +83,7 @@ packages: hackage: hashtables-1.4.2@sha256:4940cab94a15d469845ccf5225f9cb3d354c15e8127ebb58425c8b681f7721d9,10386 snapshots: - completed: - sha256: 238fa745b64f91184f9aa518fe04bdde6552533d169b0da5256670df83a0f1a9 - size: 721141 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/44.yaml - original: lts-22.44 + sha256: 7e724f347d5969cb5e8dde9f9aae30996e3231c29d1dafd45f21f1700d4c4fcb + size: 684460 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/23/28.yaml + original: lts-23.28