diff --git a/.github/workflows/haskell_cabal.yaml b/.github/workflows/haskell_cabal.yaml index 63280d9..27ccf4f 100644 --- a/.github/workflows/haskell_cabal.yaml +++ b/.github/workflows/haskell_cabal.yaml @@ -7,46 +7,60 @@ on: pull_request: branches: - master + workflow_dispatch: jobs: build: strategy: + fail-fast: false matrix: plan: - ghc-version: '8.4.4' - cabal-version: '2.4' + cabal-version: '3.10' + ubuntu-version: '24.04' - ghc-version: '8.8' - cabal-version: '3.0' + cabal-version: '3.10' + ubuntu-version: '24.04' - ghc-version: '8.10.7' - cabal-version: '3.0' + cabal-version: '3.10' + ubuntu-version: '24.04' - ghc-version: '9.0.2' - cabal-version: '3.0' + cabal-version: '3.10' + ubuntu-version: '24.04' - ghc-version: '9.2.4' - cabal-version: '3.0' + cabal-version: '3.10' + ubuntu-version: '24.04' - ghc-version: '9.4.2' - cabal-version: '3.0' - runs-on: ubuntu-latest + cabal-version: '3.10' + ubuntu-version: '24.04' + - ghc-version: '9.6.7' + cabal-version: '3.10' + ubuntu-version: 'latest' + - ghc-version: '9.8.4' + cabal-version: '3.12' + ubuntu-version: 'latest' + - ghc-version: '9.10.3' + cabal-version: '3.14' + ubuntu-version: 'latest' + runs-on: 'ubuntu-${{ matrix.plan.ubuntu-version }}' steps: - uses: actions/checkout@v2 - name: Cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.cabal/packages ~/.cabal/store dist-newstyle - key: ${{ matrix.plan.ghc-version }} + key: ${{ matrix.plan.ghc-version }}-${{ hashFiles('hal.cabal') }} + # Still use a reasonable warm start on a miss + restore-keys: | + ${{ matrix.plan.ghc-version }}- - name: Install Cabal - uses: haskell/actions/setup@v1 + uses: haskell-actions/setup@v2 with: ghc-version: ${{ matrix.plan.ghc-version }} cabal-version: ${{ matrix.plan.cabal-version }} - - name: Install Project Dependencies (Cabal v3) - run: | - set -ex - cabal install --lib --force-reinstalls --ghc-options=-O0 --reorder-goals --max-backjumps=-1 - set +ex - if: "startsWith(matrix.plan.cabal-version, '3')" - name: Install Project Dependencies (Cabal v2) run: | set -ex diff --git a/.github/workflows/haskell_nix.yaml b/.github/workflows/haskell_nix.yaml new file mode 100644 index 0000000..fcec038 --- /dev/null +++ b/.github/workflows/haskell_nix.yaml @@ -0,0 +1,38 @@ +name: Nix Haskell Builds + +on: + push: + branches: + - master + pull_request: + branches: + - master + workflow_dispatch: + +jobs: + build: + continue-on-error: ${{ matrix.experimental }} + strategy: + fail-fast: false + matrix: + channel: + - 26-05 + - 25-11 + - 25-05 + experimental: + - false + include: + - channel: unstable + experimental: true + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Install Nix + uses: cachix/install-nix-action@v27 + - name: Cache Nix Store + uses: DeterminateSystems/magic-nix-cache-action@main + - name: Build Project + run: | + set -ex + nix-build --arg channel '"${{ matrix.channel }}"' --show-trace + set +ex diff --git a/.github/workflows/haskell_stack.yaml b/.github/workflows/haskell_stack.yaml index 736b6ff..ea1ef3f 100644 --- a/.github/workflows/haskell_stack.yaml +++ b/.github/workflows/haskell_stack.yaml @@ -7,11 +7,13 @@ on: pull_request: branches: - master + workflow_dispatch: jobs: build: continue-on-error: ${{ matrix.experimental }} strategy: + fail-fast: false matrix: resolver: - lts-13 @@ -23,6 +25,9 @@ jobs: - lts-19 - lts-20 - lts-21 + - lts-22 + - lts-23 + - lts-24 experimental: - false include: @@ -32,7 +37,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.stack diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index ec69d4c..fcc9d67 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -3,6 +3,7 @@ name: Publish to Hackage on: push: tags: + - "v?[0-9]+.[0-9]+" - "v?[0-9]+.[0-9]+.[0-9]+" - "v?[0-9]+.[0-9]+.[0-9]+.[0-9]+" @@ -12,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.stack diff --git a/CHANGELOG.md b/CHANGELOG.md index eb8459c..fcf96b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ The format is based on [Keep a Changelog][chg] and this project adheres to - Add `messageGroupId` to SQS Attributes. - Fix the type of `messageAttributes` in `SQSEvent`. - Fix header parsing to accept `null` values serialised as `{}` + - The `use-aeson-2.2` flag has been removed in favour of a + dependency on the `attoparsec-aeson` compatibility package. ## `1.1` - 2023-12-18 diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..863accc --- /dev/null +++ b/default.nix @@ -0,0 +1,9 @@ +# Entry point for building against a given nixpkgs release channel, e.g.: +# nix-build --arg channel '"unstable"' +# nix-build # defaults to the current stable channel +{ channel ? "26-05" }: + +let + pkgs = import (./nix/nixpkgs + "/${channel}.nix"); +in +import ./nix/hal.nix { inherit pkgs; } diff --git a/hal.cabal b/hal.cabal index 2979637..6c957ca 100644 --- a/hal.cabal +++ b/hal.cabal @@ -3,8 +3,6 @@ cabal-version: 1.12 -- This file has been generated from package.yaml by hpack version 0.39.1. -- -- see: https://github.com/sol/hpack --- --- hash: a8f1e61978a7c0772b00f7d79b8d54b83646f1aac9da8e964f32057442567c95 name: hal version: 1.1 @@ -29,11 +27,6 @@ source-repository head type: git location: https://github.com/Nike-inc/hal -flag use-aeson-2-2 - description: Required parsers are split out into a different package - manual: False - default: True - library exposed-modules: AWS.Lambda.Combinators @@ -76,7 +69,9 @@ library ScopedTypeVariables ghc-options: -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints -fno-warn-partial-type-signatures -fno-warn-name-shadowing -fwarn-tabs -fwarn-unused-imports -fwarn-missing-signatures -fwarn-incomplete-patterns build-depends: - base >=4.7 && <5 + aeson >=1.4.1.0 && <2.3 + , attoparsec-aeson >=2.1.0.0 && <2.3 + , base >=4.7 && <5 , base64-bytestring , bytestring , case-insensitive @@ -93,13 +88,6 @@ library , time , unordered-containers default-language: Haskell2010 - if flag(use-aeson-2-2) - build-depends: - aeson >=2.2.0.0 && <2.3.0.0 - , attoparsec-aeson - else - build-depends: - aeson >=1.2.0.0 && <1.6 || >=2.0.0.0 && <2.2.0.0 test-suite hal-test type: exitcode-stdio-1.0 diff --git a/nix/hal.nix b/nix/hal.nix new file mode 100644 index 0000000..09a3db0 --- /dev/null +++ b/nix/hal.nix @@ -0,0 +1,3 @@ +{ pkgs }: + +pkgs.haskellPackages.callCabal2nix "hal" ../. { } diff --git a/nix/nixpkgs/25-05.nix b/nix/nixpkgs/25-05.nix new file mode 100644 index 0000000..b3c272e --- /dev/null +++ b/nix/nixpkgs/25-05.nix @@ -0,0 +1,3 @@ +# Stable release channel, kept until it ages out of the ~1.5yr support +# window (see nix/nixpkgs/26-05.nix for pinning notes). +import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/refs/heads/nixos-25.05.tar.gz") {} diff --git a/nix/nixpkgs/25-11.nix b/nix/nixpkgs/25-11.nix new file mode 100644 index 0000000..1acf8c5 --- /dev/null +++ b/nix/nixpkgs/25-11.nix @@ -0,0 +1,3 @@ +# Stable release channel, kept until it ages out of the ~1.5yr support +# window (see nix/nixpkgs/26-05.nix for pinning notes). +import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/refs/heads/nixos-25.11.tar.gz") {} diff --git a/nix/nixpkgs/26-05.nix b/nix/nixpkgs/26-05.nix new file mode 100644 index 0000000..a0120ff --- /dev/null +++ b/nix/nixpkgs/26-05.nix @@ -0,0 +1,5 @@ +# Stable release channel. Deliberately tracks the moving tip of the +# nixos-26.05 branch rather than an exact commit: that branch only ever +# gains Hydra-vetted backports (security fixes, critical bug fixes) for +# this release, the same stream a real `nix-channel --update` consumes. +import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/refs/heads/nixos-26.05.tar.gz") {} diff --git a/nix/nixpkgs/unstable.nix b/nix/nixpkgs/unstable.nix new file mode 100644 index 0000000..18a11c8 --- /dev/null +++ b/nix/nixpkgs/unstable.nix @@ -0,0 +1,4 @@ +# Experimental channel. Deliberately unpinned so every CI run picks up whatever +# is at the tip of nixos-unstable. Marked `experimental: true` in the CI +# matrix so breakage here doesn't block merges. +import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/refs/heads/nixos-unstable.tar.gz") {} diff --git a/package.yaml b/package.yaml index ca385a9..5052817 100644 --- a/package.yaml +++ b/package.yaml @@ -52,15 +52,11 @@ ghc-options: - -fwarn-missing-signatures - -fwarn-incomplete-patterns -flags: - use-aeson-2-2: - description: Required parsers are split out into a different package - default: true - manual: false - library: source-dirs: src dependencies: + - aeson >=1.4.1.0 && <2.3 + - attoparsec-aeson >=2.1.0.0 && <2.3 - base64-bytestring - bytestring - case-insensitive @@ -76,15 +72,6 @@ library: - text - time - unordered-containers - when: - - condition: flag(use-aeson-2-2) - then: - dependencies: - - aeson >=2.2.0.0 && <2.3.0.0 - - attoparsec-aeson - else: - dependencies: - - aeson >=1.2.0.0 && <1.6 || >=2.0.0.0 && <2.2.0.0 tests: hal-test: diff --git a/stack-lts-13.yaml b/stack-lts-13.yaml index ba81191..17aa32c 100644 --- a/stack-lts-13.yaml +++ b/stack-lts-13.yaml @@ -1,10 +1,8 @@ -resolver: lts-13.30 +resolver: lts-13 packages: - . -flags: - hal: - use-aeson-2-2: false extra-deps: +- attoparsec-aeson-2.1.0.0 - hedgehog-1.0.5@sha256:85a2d8df595c91b815e9d2ef7734189d7028ce16212e83f35b2221807d87770b,4368 - hspec-2.7.1@sha256:0aa48928ce80a34f8ff8c5ef114bb6807edfb8d884bcd7211eceed710e7fb7a8,1769 - hspec-core-2.7.1@sha256:ead64b6d552e477549624fc9de3658657faac0dabf7109f889d595be05547bbf,4594 diff --git a/stack-lts-13.yaml.lock b/stack-lts-13.yaml.lock deleted file mode 100644 index 04e5164..0000000 --- a/stack-lts-13.yaml.lock +++ /dev/null @@ -1,75 +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: hedgehog-1.0.5@sha256:85a2d8df595c91b815e9d2ef7734189d7028ce16212e83f35b2221807d87770b,4368 - pantry-tree: - size: 2575 - sha256: 9189de078d9bddcf9b2bf6e6a11a7dbcc2fec962b081e0a4b58301b14f6e25a7 - original: - hackage: hedgehog-1.0.5@sha256:85a2d8df595c91b815e9d2ef7734189d7028ce16212e83f35b2221807d87770b,4368 -- completed: - hackage: hspec-2.7.1@sha256:0aa48928ce80a34f8ff8c5ef114bb6807edfb8d884bcd7211eceed710e7fb7a8,1769 - pantry-tree: - size: 532 - sha256: 8128733a7ef4760bbe5d978f2145fdcb29f4491b17db11e8c05b409441ceecb4 - original: - hackage: hspec-2.7.1@sha256:0aa48928ce80a34f8ff8c5ef114bb6807edfb8d884bcd7211eceed710e7fb7a8,1769 -- completed: - hackage: hspec-core-2.7.1@sha256:ead64b6d552e477549624fc9de3658657faac0dabf7109f889d595be05547bbf,4594 - pantry-tree: - size: 3601 - sha256: 22fd4a0b7391f22e0f5956a00b575b2d7d61fbf59c989c73213a71fd2e712e5a - original: - hackage: hspec-core-2.7.1@sha256:ead64b6d552e477549624fc9de3658657faac0dabf7109f889d595be05547bbf,4594 -- completed: - hackage: hspec-discover-2.7.1@sha256:e8ce36741c06b41de58069814a7d3b7314bdeaab35ae573e3c924739011e0c29,2243 - pantry-tree: - size: 1080 - sha256: 2d1c4ccbd0c9047311d1bd24989714df844003c258964ef65d542f6627dc0fed - original: - hackage: hspec-discover-2.7.1@sha256:e8ce36741c06b41de58069814a7d3b7314bdeaab35ae573e3c924739011e0c29,2243 -- completed: - hackage: hspec-hedgehog-0.0.1.2@sha256:4d09c7be34cdc941b78e4e964f71013ffeeb099ea32d8ede17ad9c03ae7a62e3,1470 - pantry-tree: - size: 379 - sha256: 8f67eea5401371f7e1ea44f2b74130e2b3b2cc16eec28b097f72c7ffbb56a58c - original: - hackage: hspec-hedgehog-0.0.1.2@sha256:4d09c7be34cdc941b78e4e964f71013ffeeb099ea32d8ede17ad9c03ae7a62e3,1470 -- completed: - hackage: QuickCheck-2.14.2@sha256:4ce29211223d5e6620ebceba34a3ca9ccf1c10c0cf387d48aea45599222ee5aa,7736 - pantry-tree: - size: 2315 - sha256: 2fe423d0ed7cd64f0f165d708779f48814e66c4f181c568468134af55d86a5f8 - original: - hackage: QuickCheck-2.14.2@sha256:4ce29211223d5e6620ebceba34a3ca9ccf1c10c0cf387d48aea45599222ee5aa,7736 -- completed: - hackage: random-1.2.0@sha256:30d72df4cc1d2fe2d445c88f0ee9d21965af7ce86660c43a6c32a6a1d90d51c9,6094 - pantry-tree: - size: 1259 - sha256: 92b5a834ba603ee4d006968a75847f4fd93a566b8a96e1b463b8229f8ce9961d - original: - hackage: random-1.2.0@sha256:30d72df4cc1d2fe2d445c88f0ee9d21965af7ce86660c43a6c32a6a1d90d51c9,6094 -- completed: - hackage: splitmix-0.1.0.3@sha256:fc3aae74c467f4b608050bef53aec17904a618731df9407e655d8f3bf8c32d5c,6049 - pantry-tree: - size: 1400 - sha256: 8290f921f41c3628a6c9871502e57fd1d25f5954967afbf4ed16717fd8d3656f - original: - hackage: splitmix-0.1.0.3@sha256:fc3aae74c467f4b608050bef53aec17904a618731df9407e655d8f3bf8c32d5c,6049 -- completed: - hackage: uuid-types-1.0.5@sha256:5031383749d57cb95877d7e56f0300be66652b6e57f5ba6681dcc6e4f78d046d,2541 - pantry-tree: - size: 480 - sha256: e11a2bc87a8c811480a62f6cf08a2e53480b468b0fdf6fbe1c063f207b6aa796 - original: - hackage: uuid-types-1.0.5 -snapshots: -- completed: - size: 500539 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/13/30.yaml - sha256: 59ad6b944c9903847fecdc1d4815e8500c1f9999d80fd1b4d2d66e408faec44b - original: lts-13.30 diff --git a/stack-lts-14.yaml b/stack-lts-14.yaml index 249862b..c310980 100644 --- a/stack-lts-14.yaml +++ b/stack-lts-14.yaml @@ -1,9 +1,7 @@ -resolver: lts-14.27 +resolver: lts-14 packages: - . -flags: - hal: - use-aeson-2-2: false extra-deps: +- attoparsec-aeson-2.1.0.0 - hedgehog-1.0.5@sha256:85a2d8df595c91b815e9d2ef7734189d7028ce16212e83f35b2221807d87770b,4368 - hspec-hedgehog-0.0.1.2@sha256:4d09c7be34cdc941b78e4e964f71013ffeeb099ea32d8ede17ad9c03ae7a62e3,1470 diff --git a/stack-lts-14.yaml.lock b/stack-lts-14.yaml.lock deleted file mode 100644 index bfe4876..0000000 --- a/stack-lts-14.yaml.lock +++ /dev/null @@ -1,26 +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: hedgehog-1.0.5@sha256:85a2d8df595c91b815e9d2ef7734189d7028ce16212e83f35b2221807d87770b,4368 - pantry-tree: - size: 2575 - sha256: 9189de078d9bddcf9b2bf6e6a11a7dbcc2fec962b081e0a4b58301b14f6e25a7 - original: - hackage: hedgehog-1.0.5@sha256:85a2d8df595c91b815e9d2ef7734189d7028ce16212e83f35b2221807d87770b,4368 -- completed: - hackage: hspec-hedgehog-0.0.1.2@sha256:4d09c7be34cdc941b78e4e964f71013ffeeb099ea32d8ede17ad9c03ae7a62e3,1470 - pantry-tree: - size: 379 - sha256: 8f67eea5401371f7e1ea44f2b74130e2b3b2cc16eec28b097f72c7ffbb56a58c - original: - hackage: hspec-hedgehog-0.0.1.2@sha256:4d09c7be34cdc941b78e4e964f71013ffeeb099ea32d8ede17ad9c03ae7a62e3,1470 -snapshots: -- completed: - size: 524996 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/14/27.yaml - sha256: 7ea31a280c56bf36ff591a7397cc384d0dff622e7f9e4225b47d8980f019a0f0 - original: lts-14.27 diff --git a/stack-lts-15.yaml b/stack-lts-15.yaml index ea1b672..79d08ea 100644 --- a/stack-lts-15.yaml +++ b/stack-lts-15.yaml @@ -1,9 +1,7 @@ -resolver: lts-15.16 +resolver: lts-15 packages: - . -flags: - hal: - use-aeson-2-2: false extra-deps: +- attoparsec-aeson-2.1.0.0 - hedgehog-1.0.5@sha256:85a2d8df595c91b815e9d2ef7734189d7028ce16212e83f35b2221807d87770b,4368 - hspec-hedgehog-0.0.1.2@sha256:4d09c7be34cdc941b78e4e964f71013ffeeb099ea32d8ede17ad9c03ae7a62e3,1470 diff --git a/stack-lts-15.yaml.lock b/stack-lts-15.yaml.lock deleted file mode 100644 index d1e857c..0000000 --- a/stack-lts-15.yaml.lock +++ /dev/null @@ -1,26 +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: hedgehog-1.0.5@sha256:85a2d8df595c91b815e9d2ef7734189d7028ce16212e83f35b2221807d87770b,4368 - pantry-tree: - size: 2575 - sha256: 9189de078d9bddcf9b2bf6e6a11a7dbcc2fec962b081e0a4b58301b14f6e25a7 - original: - hackage: hedgehog-1.0.5@sha256:85a2d8df595c91b815e9d2ef7734189d7028ce16212e83f35b2221807d87770b,4368 -- completed: - hackage: hspec-hedgehog-0.0.1.2@sha256:4d09c7be34cdc941b78e4e964f71013ffeeb099ea32d8ede17ad9c03ae7a62e3,1470 - pantry-tree: - size: 379 - sha256: 8f67eea5401371f7e1ea44f2b74130e2b3b2cc16eec28b097f72c7ffbb56a58c - original: - hackage: hspec-hedgehog-0.0.1.2@sha256:4d09c7be34cdc941b78e4e964f71013ffeeb099ea32d8ede17ad9c03ae7a62e3,1470 -snapshots: -- completed: - size: 496120 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/15/16.yaml - sha256: cf30623a2c147f51eecc8f9d6440f5d1b671af21380505e633faff32b565f3d5 - original: lts-15.16 diff --git a/stack-lts-16.yaml b/stack-lts-16.yaml index 3566383..040b955 100644 --- a/stack-lts-16.yaml +++ b/stack-lts-16.yaml @@ -1,6 +1,5 @@ -resolver: lts-16.31 +resolver: lts-16 packages: - . -flags: - hal: - use-aeson-2-2: false +extra-deps: +- attoparsec-aeson-2.1.0.0 diff --git a/stack-lts-16.yaml.lock b/stack-lts-16.yaml.lock deleted file mode 100644 index c222190..0000000 --- a/stack-lts-16.yaml.lock +++ /dev/null @@ -1,12 +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: [] -snapshots: -- completed: - size: 534126 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml - sha256: 637fb77049b25560622a224845b7acfe81a09fdb6a96a3c75997a10b651667f6 - original: lts-16.31 diff --git a/stack-lts-17.yaml b/stack-lts-17.yaml index 358db43..c9d90db 100644 --- a/stack-lts-17.yaml +++ b/stack-lts-17.yaml @@ -1,6 +1,5 @@ -resolver: lts-17.10 +resolver: lts-17 packages: - . -flags: - hal: - use-aeson-2-2: false +extra-deps: +- attoparsec-aeson-2.1.0.0 diff --git a/stack-lts-17.yaml.lock b/stack-lts-17.yaml.lock deleted file mode 100644 index 8d05737..0000000 --- a/stack-lts-17.yaml.lock +++ /dev/null @@ -1,12 +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: [] -snapshots: -- completed: - size: 567241 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/10.yaml - sha256: 321b3b9f0c7f76994b39e0dabafdc76478274b4ff74cc5e43d410897a335ad3b - original: lts-17.10 diff --git a/stack-lts-18.yaml b/stack-lts-18.yaml index c6fcb18..627aa7a 100644 --- a/stack-lts-18.yaml +++ b/stack-lts-18.yaml @@ -1,6 +1,5 @@ -resolver: lts-18.28 +resolver: lts-18 packages: - . -flags: - hal: - use-aeson-2-2: false +extra-deps: +- attoparsec-aeson-2.1.0.0 diff --git a/stack-lts-19.yaml b/stack-lts-19.yaml index 20fd11d..bd92377 100644 --- a/stack-lts-19.yaml +++ b/stack-lts-19.yaml @@ -1,6 +1,5 @@ -resolver: lts-19.32 +resolver: lts-19 packages: - . -flags: - hal: - use-aeson-2-2: false +extra-deps: +- attoparsec-aeson-2.1.0.0 diff --git a/stack-lts-20.yaml b/stack-lts-20.yaml index 054fbee..14b4f1e 100644 --- a/stack-lts-20.yaml +++ b/stack-lts-20.yaml @@ -1,6 +1,5 @@ -resolver: lts-20.26 +resolver: lts-20 packages: - . -flags: - hal: - use-aeson-2-2: false +extra-deps: +- attoparsec-aeson-2.1.0.0 diff --git a/stack-lts-21.yaml b/stack-lts-21.yaml index 01a9821..7a89a3d 100644 --- a/stack-lts-21.yaml +++ b/stack-lts-21.yaml @@ -1,6 +1,3 @@ -resolver: lts-21.14 +resolver: lts-21 packages: - . -flags: - hal: - use-aeson-2-2: false diff --git a/stack-lts-21.yaml.lock b/stack-lts-21.yaml.lock deleted file mode 100644 index 31decf5..0000000 --- a/stack-lts-21.yaml.lock +++ /dev/null @@ -1,12 +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: [] -snapshots: -- completed: - sha256: 60e54c1ba3c1e7163acf6dafa9d56b2d3b23f88a31ad53a1c9d888f32561f8da - size: 639819 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/14.yaml - original: lts-21.14 diff --git a/stack-lts-22.yaml b/stack-lts-22.yaml new file mode 100644 index 0000000..063476c --- /dev/null +++ b/stack-lts-22.yaml @@ -0,0 +1,3 @@ +resolver: lts-22 +packages: +- . diff --git a/stack-lts-23.yaml b/stack-lts-23.yaml new file mode 100644 index 0000000..e21adc0 --- /dev/null +++ b/stack-lts-23.yaml @@ -0,0 +1,3 @@ +resolver: lts-23 +packages: +- . diff --git a/stack-lts-24.yaml b/stack-lts-24.yaml new file mode 100644 index 0000000..31f0b10 --- /dev/null +++ b/stack-lts-24.yaml @@ -0,0 +1,3 @@ +resolver: lts-24 +packages: +- .