From 37577121ffc1f2899a2a939bdde18b4ddcebbead Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Wed, 19 Aug 2026 18:19:30 +0300 Subject: [PATCH] Allow aeson-2.3 --- .github/workflows/haskell-ci.yml | 10 +++++----- binary-instances.cabal | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 6691cef..a6497ef 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20260331 +# version: 0.19.20260624 # -# REGENDATA ("0.19.20260331",["github","cabal.project"]) +# REGENDATA ("0.19.20260624",["github","cabal.project"]) # name: Haskell-CI on: @@ -182,7 +182,7 @@ jobs: chmod a+x $HOME/.cabal/bin/cabal-plan cabal-plan --version - name: checkout - uses: actions/checkout@v5 + uses: actions/checkout@v7 with: path: source - name: initial cabal.project for sdist @@ -220,7 +220,7 @@ jobs: $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all cabal-plan - name: restore cache - uses: actions/cache/restore@v4 + uses: actions/cache/restore@v6 with: key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} path: ~/.cabal/store @@ -251,7 +251,7 @@ jobs: $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all - name: save cache if: always() - uses: actions/cache/save@v4 + uses: actions/cache/save@v6 with: key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} path: ~/.cabal/store diff --git a/binary-instances.cabal b/binary-instances.cabal index f9d4a10..a3dab40 100644 --- a/binary-instances.cabal +++ b/binary-instances.cabal @@ -1,7 +1,7 @@ cabal-version: 2.2 name: binary-instances version: 1.0.6 -x-revision: 1 +x-revision: 2 synopsis: Orphan instances for binary description: `binary-instances` defines orphan instances for types in some popular packages. @@ -46,7 +46,7 @@ library , tagged >=0.8.8 && <0.8.11 build-depends: - , aeson ^>=2.2.2.0 + , aeson ^>=2.2.2.0 || ^>=2.3.0.0 , binary-orphans ^>=1.0.5 , hashable ^>=1.4.4.0 || ^>=1.5.0.0 , primitive ^>=0.9.0.0