From a91a22261332763278ea3abc626d317f30d48d1c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 8 Jul 2025 18:48:20 +0200 Subject: [PATCH] chore: stackage 22.41 -> 22.44 Updates stackage to 22.44, which is also supported on FreeBSD, where GHC 9.6.7 is available again. --- .cirrus.yml | 4 +-- .github/workflows/build.yaml | 4 +-- postgrest.cabal | 8 +++--- stack-21.7.yaml | 24 ------------------ stack-21.7.yaml.lock | 47 ------------------------------------ stack.yaml | 3 +-- stack.yaml.lock | 17 ++++--------- 7 files changed, 13 insertions(+), 94 deletions(-) delete mode 100644 stack-21.7.yaml delete mode 100644 stack-21.7.yaml.lock diff --git a/.cirrus.yml b/.cirrus.yml index eb090dc34..5e8687c82 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,5 +1,5 @@ freebsd_instance: - image_family: freebsd-14-2 + image_family: freebsd-14-3 build_task: # Don't change this name without adjusting .github/workflows/build.yaml @@ -35,7 +35,7 @@ build_task: - find main src -type f -iname '*.hs' -exec md5sum "{}" + build_script: | - stack build -j 1 --local-bin-path . --copy-bins --stack-yaml stack-21.7.yaml + stack build -j 1 --local-bin-path . --copy-bins strip postgrest bin_artifacts: diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 6fdc1fa5f..32f69cab0 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.6 + ghc-version: 9.6.7 enable-stack: true stack-no-global: true stack-setup-ghc: true @@ -180,7 +180,7 @@ jobs: cabal: strategy: matrix: - ghc: ['9.6.6', '9.8.2'] + ghc: ['9.6.7', '9.8.2'] fail-fast: false name: Cabal - Linux x86-64 - GHC ${{ matrix.ghc }} runs-on: ubuntu-24.04 diff --git a/postgrest.cabal b/postgrest.cabal index 1e55a7b81..0106d2dc9 100644 --- a/postgrest.cabal +++ b/postgrest.cabal @@ -16,13 +16,11 @@ extra-source-files: CHANGELOG.md cabal-version: >= 1.10 tested-with: - -- stack on FreeBSD - GHC == 9.4.5 -- nix, cabal on Ubuntu (arm) - , GHC == 9.4.8 + GHC == 9.4.8 -- cabal on Ubuntu - -- stack on MacOS, Ubuntu, Windows - , GHC == 9.6.6 + -- stack on FreeBSD, MacOS, Ubuntu, Windows + , GHC == 9.6.7 -- cabal on Ubuntu , GHC == 9.8.2 diff --git a/stack-21.7.yaml b/stack-21.7.yaml deleted file mode 100644 index de212c4e3..000000000 --- a/stack-21.7.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# We're keeping this at 21.7 for freebsd right now, because: -# Error: [S-9443] -# No setup information found for ghc-9.6.4 on your platform. This probably means a GHC binary -# distribution has not yet been added for OS key freebsd64-ino64. Supported versions: -# ghc-8.4.3, ghc-8.4.4, ghc-8.6.2, ghc-8.6.3, ghc-8.6.4, ghc-8.6.5, ghc-8.8.1, ghc-8.8.2, -# ghc-8.8.3, ghc-8.8.4, ghc-8.10.3, ghc-8.10.4, ghc-8.10.6, ghc-8.10.7, ghc-9.0.2, ghc-9.2.5, -# ghc-9.2.6, ghc-9.2.7, ghc-9.2.8 and ghc-9.4.5. -resolver: lts-21.7 # 2023-08-14, GHC 9.4.5 - -nix: - packages: - - pcre - - pkgconfig - - postgresql - - zlib - # disable pure by default so that the test environment can be passed - pure: false - -extra-deps: - - configurator-pg-0.2.10 - - fuzzyset-0.2.4 - - hasql-notifications-0.2.2.2 - - hasql-pool-1.0.1 - - postgresql-libpq-0.10.1.0 diff --git a/stack-21.7.yaml.lock b/stack-21.7.yaml.lock deleted file mode 100644 index e9f8ff610..000000000 --- a/stack-21.7.yaml.lock +++ /dev/null @@ -1,47 +0,0 @@ -# This file was autogenerated by Stack. -# You should not edit this file by hand. -# For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files - -packages: -- completed: - hackage: configurator-pg-0.2.10@sha256:dbb9381c4f491b838214289c59d465eff99f6b569334a98ccf836548970e0f49,2786 - pantry-tree: - sha256: a6dc0197c8c8515877ff579c088511edcf2d1090d9a73ac618d884101d6cbed8 - size: 2463 - original: - hackage: configurator-pg-0.2.10 -- completed: - hackage: fuzzyset-0.2.4@sha256:f1b6de8bf33277bf6255207541d65028f1f1ea93af5541b654c86b5674995485,1618 - pantry-tree: - sha256: cee68e8d88f530e9e0588b81b260236936fe3318ef9a66e9f43f680b4cd5f76e - size: 574 - original: - hackage: fuzzyset-0.2.4 -- 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: - sha256: d98e1269bdd60989b0eb0b84e1d5357eaa9f92821439d9f206663b7251ee95b2 - size: 799 - original: - hackage: hasql-pool-1.0.1 -- completed: - hackage: postgresql-libpq-0.10.1.0@sha256:6b580c9d5068e78eecc13e655b2885c8e79cdacfca513c5d1e5a6b9dc61d9758,3166 - pantry-tree: - sha256: ae81e7628a8f3d1ef33ace71fa0845c073c003ca7f1150cc9d9ba1e55fc84236 - size: 1096 - original: - hackage: postgresql-libpq-0.10.1.0 -snapshots: -- completed: - sha256: 23bb9bb355bfdb1635252e120a29b712f0d5e8a6c6a65c5ab5bd6692f46c438e - size: 640457 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/7.yaml - original: lts-21.7 diff --git a/stack.yaml b/stack.yaml index 66ab15957..2ccc290f2 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-22.41 # 2024-11-10, GHC 9.6.6 +resolver: lts-22.44 # 2025-05-02, GHC 9.6.7 nix: packages: @@ -14,4 +14,3 @@ extra-deps: - hasql-pool-1.0.1 - jose-jwt-0.10.0 - postgresql-libpq-0.10.1.0 - - hasql-notifications-0.2.2.2 diff --git a/stack.yaml.lock b/stack.yaml.lock index b438b8b68..32956204f 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -1,7 +1,7 @@ # This file was autogenerated by Stack. # You should not edit this file by hand. # For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files +# https://docs.haskellstack.org/en/stable/topics/lock_files packages: - completed: @@ -32,16 +32,9 @@ packages: size: 1096 original: hackage: postgresql-libpq-0.10.1.0 -- 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 snapshots: - completed: - sha256: 1e32b51d9082fdf6f3bd92accc9dfffd4ddaf406404427fb10bf76d2bc03cbbb - size: 720263 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/41.yaml - original: lts-22.41 + sha256: 238fa745b64f91184f9aa518fe04bdde6552533d169b0da5256670df83a0f1a9 + size: 721141 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/44.yaml + original: lts-22.44