diff --git a/.cirrus.yml b/.cirrus.yml index 5e8687c826..06d817f366 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,5 +1,5 @@ freebsd_instance: - image_family: freebsd-14-3 + image_family: freebsd-15-0-snap build_task: # Don't change this name without adjusting .github/workflows/build.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 71af5a0b1b..17d2d1b8c8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -130,7 +130,7 @@ jobs: - uses: haskell-actions/setup@96f3dafd067155f32643c2a0757ab71d2910e2c2 # v2.8.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 08550e9a9f..5909615870 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 @@ -94,7 +94,7 @@ library , HTTP >= 4000.3.7 && < 4000.5 , Ranged-sets >= 0.3 && < 0.5 , aeson >= 2.0.3 && < 2.3 - , auto-update >= 0.1.4 && < 0.2 + , auto-update >= 0.1.4 && < 0.3 , base64-bytestring >= 1 && < 1.3 , bytestring >= 0.10.8 && < 0.13 , cache >= 0.1.3 && < 0.2.0 @@ -103,7 +103,7 @@ library , clock >= 0.8.3 && < 0.9.0 , configurator-pg >= 0.2 && < 0.3 , containers >= 0.5.7 && < 0.7 - , cookie >= 0.4.2 && < 0.5 + , cookie >= 0.4.2 && < 0.6 , directory >= 1.2.6 && < 1.4 , either >= 4.4.1 && < 5.1 , extra >= 1.7.0 && < 2.0 @@ -112,17 +112,17 @@ library , hasql-dynamic-statements >= 0.3.1 && < 0.4 , hasql-notifications >= 0.2.2.2 && < 0.2.3 , hasql-pool >= 1.0.1 && < 1.1 - , hasql-transaction >= 1.0.1 && < 1.1 + , hasql-transaction >= 1.0.1 && < 1.2 , heredoc >= 0.2 && < 0.3 , http-types >= 0.12.2 && < 0.13 , insert-ordered-containers >= 0.2.2 && < 0.3 , iproute >= 1.7.0 && < 1.8 , jose-jwt >= 0.9.6 && < 0.11 - , lens >= 4.14 && < 5.3 + , lens >= 4.14 && < 5.4 , lens-aeson >= 1.0.1 && < 1.3 , mtl >= 2.2.2 && < 2.4 , neat-interpolation >= 0.5 && < 0.6 - , network >= 2.6 && < 3.2 + , network >= 2.6 && < 3.3 , network-uri >= 2.6.1 && < 2.8 , optparse-applicative >= 0.13 && < 0.19 , parsec >= 3.1.11 && < 3.2 @@ -150,7 +150,7 @@ library -- for unix sockets; this is tested in test/io/test_io.py. See -- https://github.com/kazu-yamamoto/logger/commit/3a71ca70afdbb93d4ecf0083eeba1fbbbcab3fc3 , wai-logger >= 2.4.0 - , warp >= 3.3.19 && < 3.4 + , warp >= 3.3.19 && < 3.5 -- -fno-spec-constr may help keep compile time memory use in check, -- see https://gitlab.haskell.org/ghc/ghc/issues/16017#note_219304 -- -optP-Wno-nonportable-include-path @@ -259,14 +259,14 @@ test-suite spec , case-insensitive >= 1.2 && < 1.3 , containers >= 0.5.7 && < 0.7 , hasql-pool >= 1.0.1 && < 1.1 - , hasql-transaction >= 1.0.1 && < 1.1 + , hasql-transaction >= 1.0.1 && < 1.2 , heredoc >= 0.2 && < 0.3 , hspec >= 2.3 && < 2.12 , hspec-wai >= 0.10 && < 0.12 , hspec-wai-json >= 0.10 && < 0.12 , http-types >= 0.12.3 && < 0.13 , jose-jwt >= 0.9.6 && < 0.11 - , lens >= 4.14 && < 5.3 + , lens >= 4.14 && < 5.4 , lens-aeson >= 1.0.1 && < 1.3 , monad-control >= 1.0.1 && < 1.1 , postgrest diff --git a/stack.yaml b/stack.yaml index 20de8d453e..6ca904213e 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.27 # 2025-07-06, GHC 9.8.4 nix: packages: @@ -10,6 +10,15 @@ nix: extra-deps: - 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 + +allow-newer: true +allow-newer-deps: + - fuzzyset + - hasql diff --git a/stack.yaml.lock b/stack.yaml.lock index 32956204fc..50b87c6e0e 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -11,6 +11,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: @@ -19,22 +47,22 @@ 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 snapshots: - completed: - sha256: 238fa745b64f91184f9aa518fe04bdde6552533d169b0da5256670df83a0f1a9 - size: 721141 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/44.yaml - original: lts-22.44 + sha256: 069c8189232279d04bd107557d3a62132c04ae5ce3c710649e6b40f67f10b9d5 + size: 684285 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/23/27.yaml + original: lts-23.27