diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a53bb79..2cb94d3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,17 @@ on: branches: main jobs: + generate: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - id: generate + uses: freckle/stack-action/generate-matrix@v4 + outputs: + stack-yamls: ${{ steps.generate.outputs.stack-yamls }} + test: + needs: generate runs-on: ubuntu-latest services: faktory: @@ -19,29 +29,21 @@ jobs: strategy: matrix: - stack-yaml: - - stack-nightly.yaml # ghc-9.8 - - stack.yaml # ghc-9.6 - - stack-lts-21.25.yaml # ghc-9.4 - - stack-lts-20.26.yaml # ghc-9.2 - - stack-lts-19.33.yaml # ghc-9.0 - - stack-lts-18.28.yaml # ghc-8.10 - - stack-lts-16.31.yaml # ghc-8.8 + stack-yaml: ${{ fromJSON(needs.generate.outputs.stack-yamls) }} fail-fast: false steps: - - uses: actions/checkout@v3 - - uses: freckle/stack-action@v4 - with: - stack-yaml: ${{ matrix.stack-yaml }} + - uses: actions/checkout@v4 + - uses: freckle/stack-action@v5 env: + STACK_YAML: ${{ matrix.stack-yaml }} FAKTORY_URL: tcp://localhost:7419 hlint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: haskell/actions/hlint-setup@v2 - - uses: haskell/actions/hlint-run@v2 + - uses: actions/checkout@v4 + - uses: haskell-actions/hlint-setup@v2 + - uses: haskell-actions/hlint-run@v2 with: fail-on: warning diff --git a/.github/workflows/restyled.yml b/.github/workflows/restyled.yml new file mode 100644 index 0000000..b54bdc6 --- /dev/null +++ b/.github/workflows/restyled.yml @@ -0,0 +1,18 @@ +name: Restyled + +on: + pull_request: + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + restyled: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: restyled-io/actions/setup@v4 + - uses: restyled-io/actions/run@v4 + with: + suggestions: true diff --git a/.gitignore b/.gitignore index d7e4614..c03d2c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .stack-work dist-newstyle +stack-*.yaml.lock diff --git a/.hlint.yaml b/.hlint.yaml index 5ed5fa5..4237e89 100644 --- a/.hlint.yaml +++ b/.hlint.yaml @@ -4,6 +4,7 @@ - ignore: {name: "Use list comprehension"} - ignore: {name: "Reduce duplication"} - ignore: {name: "Avoid restricted qualification", within: Faktory.Prelude} +- ignore: {name: "Functor law"} # Custom Warnings - warn: {lhs: fromJust, rhs: fromJustNote} diff --git a/.stack-all b/.stack-all new file mode 100644 index 0000000..f4e687a --- /dev/null +++ b/.stack-all @@ -0,0 +1,2 @@ +[versions] +oldest = lts-16 diff --git a/CHANGELOG.md b/CHANGELOG.md index e2ecc46..55c0572 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ -## [_Unreleased_](https://github.com/frontrowed/faktory_worker_haskell/compare/v1.1.3.0...main) +## [_Unreleased_](https://github.com/frontrowed/faktory_worker_haskell/compare/v1.1.3.1...main) + +## [v1.1.3.1](https://github.com/frontrowed/faktory_worker_haskell/compare/v1.1.3.0...v1.1.3.1) + +- Replace `cryptonite` with `crypton` ## [v1.1.3.0](https://github.com/frontrowed/faktory_worker_haskell/compare/v1.1.2.7...v1.1.3.0) diff --git a/faktory.cabal b/faktory.cabal index 20c49b7..1b2791d 100644 --- a/faktory.cabal +++ b/faktory.cabal @@ -1,13 +1,13 @@ cabal-version: 1.18 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.37.0. -- -- see: https://github.com/sol/hpack -- --- hash: 93c05d233611150574822d2e7e5b79a7f5016dbfb15705ce42d76a2cab18ec5a +-- hash: bfbcf37e9bee321d67996f4eff37053400c98d38d55290a1110538ce9725f266 name: faktory -version: 1.1.3.0 +version: 1.1.3.1 synopsis: Faktory Worker for Haskell description: Haskell client and worker process for the Faktory background job server. . @@ -109,8 +109,9 @@ library , aeson-casing , base ==4.* , bytestring + , crypton , crypton-connection - , cryptonite + , data-default , errors , megaparsec , memory diff --git a/library/Faktory/Connection.hs b/library/Faktory/Connection.hs index e99415b..9a2d658 100644 --- a/library/Faktory/Connection.hs +++ b/library/Faktory/Connection.hs @@ -9,6 +9,7 @@ module Faktory.Connection import Faktory.Prelude import Control.Applicative ((<|>)) +import Data.Default (def) import Data.Maybe (fromMaybe) import Data.Void import Network.Connection.Compat @@ -75,13 +76,7 @@ connect ConnectionInfo {..} = bracketOnError open connectionClose pure , connectionPort = connectionInfoPort , connectionUseSecure = if connectionInfoTls - then - Just - TLSSettingsSimple - { settingDisableCertificateValidation = False - , settingDisableSession = False - , settingUseServerName = False - } + then Just def else Nothing , connectionUseSocks = Nothing } diff --git a/library/Faktory/Job.hs b/library/Faktory/Job.hs index 69f1af0..fcce21b 100644 --- a/library/Faktory/Job.hs +++ b/library/Faktory/Job.hs @@ -140,8 +140,6 @@ toPairs Job {..} = , "reserve_for" .= joReserveFor jobOptions ] --- brittany-disable-next-binding - instance FromJSON args => FromJSON (Job args) where parseJSON = withObject "Job" $ \o -> Job diff --git a/library/Faktory/JobFailure.hs b/library/Faktory/JobFailure.hs index b93d7eb..4e089f3 100644 --- a/library/Faktory/JobFailure.hs +++ b/library/Faktory/JobFailure.hs @@ -17,8 +17,6 @@ data JobFailure = JobFailure } deriving stock (Show) --- brittany-disable-next-binding - instance FromJSON JobFailure where parseJSON = withObject "Failure" $ \o -> JobFailure diff --git a/library/Faktory/JobOptions.hs b/library/Faktory/JobOptions.hs index d51443c..c883022 100644 --- a/library/Faktory/JobOptions.hs +++ b/library/Faktory/JobOptions.hs @@ -54,8 +54,6 @@ data JobOptions = JobOptions deriving stock (Eq, Show, Generic) deriving (Semigroup, Monoid) via GenericSemigroupMonoid JobOptions --- brittany-disable-next-binding - instance FromJSON JobOptions where parseJSON = withObject "JobOptions" $ \o -> JobOptions diff --git a/library/Network/Connection/Compat.hs b/library/Network/Connection/Compat.hs index 609d9c5..e4f7109 100644 --- a/library/Network/Connection/Compat.hs +++ b/library/Network/Connection/Compat.hs @@ -13,8 +13,6 @@ import Network.Connection hiding (connectTo) import Network.Socket import qualified Network.Socket as S --- brittany --exactprint-only - connectTo :: ConnectionContext -> ConnectionParams -> IO Connection connectTo cg cParams = bracketOnError diff --git a/package.yaml b/package.yaml index 5b31ecf..b9a838f 100644 --- a/package.yaml +++ b/package.yaml @@ -1,6 +1,6 @@ --- name: faktory -version: 1.1.3.0 +version: 1.1.3.1 category: Network author: Freckle Engineering maintainer: engineering@freckle.com @@ -99,8 +99,9 @@ library: - aeson - aeson-casing - bytestring + - crypton - crypton-connection - - cryptonite + - data-default - errors - megaparsec - memory @@ -110,8 +111,8 @@ library: - random - resource-pool - safe-exceptions - - semigroups >= 0.19.1 - scanner + - semigroups >= 0.19.1 - text - time - unix diff --git a/stack-lts-16.31.yaml.lock b/stack-lts-16.31.yaml.lock deleted file mode 100644 index 1d0e0d8..0000000 --- a/stack-lts-16.31.yaml.lock +++ /dev/null @@ -1,61 +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: crypton-0.33@sha256:5e92f29b9b7104d91fcdda1dec9400c9ad1f1791c231cc41ceebd783fb517dee,18202 - pantry-tree: - sha256: 38809499d7f9775ef45cd29ab5c3dc9b283a813f34c1cdc56681b24f8cf8bb4f - size: 23148 - original: - hackage: crypton-0.33 -- completed: - hackage: crypton-connection-0.3.1@sha256:4d0958537197956b536ea91718b1749949757022532f50b8f683290056a19021,1581 - pantry-tree: - sha256: e35ac3a35611afab9fafac633d0c4e6328b9cce4c8262378671d6c5a739e7e70 - size: 394 - original: - hackage: crypton-connection-0.3.1 -- completed: - hackage: crypton-x509-1.7.6@sha256:c567657a705b6d6521f9dd2de999bf530d618ec00f3b939df76a41fb0fe94281,2339 - pantry-tree: - sha256: 729e7db8dfc0a8b43e08bbd8d1387c9065e39beda6ac39e0fb9f10140810a3eb - size: 1080 - original: - hackage: crypton-x509-1.7.6 -- completed: - hackage: crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750 - pantry-tree: - sha256: 87654d130a7f987ee139c821a1be45736d18df9fa4cb1142c4e054d3802338f3 - size: 406 - original: - hackage: crypton-x509-store-1.6.9 -- completed: - hackage: crypton-x509-system-1.6.7@sha256:023ed573d82983bc473a37a89e0434a085b413be9f68d07e085361056afd4637,1532 - pantry-tree: - sha256: c0ca49e6a9537f3fdb7b47c5cfe93f7d744a369bf9d089f3c668b9c2d97402b7 - size: 399 - original: - hackage: crypton-x509-system-1.6.7 -- completed: - hackage: crypton-x509-validation-1.6.12@sha256:85989721b64be4b90de9f66ef641c26f57575cffed1a50d707065fb60176f386,2227 - pantry-tree: - sha256: d4a0135f11218614fcd912cffaf54de8f749caca8696380e2589cbcfd64cc681 - size: 639 - original: - hackage: crypton-x509-validation-1.6.12 -- completed: - hackage: tls-1.7.0@sha256:fa82e9ca8fd887b66fba8433b3ba1db4e5e047fe7c815707f06209679d04177b,5566 - pantry-tree: - sha256: 7521091021ecbbbf9b46c2fdb08f9e449eddcebf3a3922f76d23baca5db83b4f - size: 4897 - original: - hackage: tls-1.7.0 -snapshots: -- completed: - sha256: 637fb77049b25560622a224845b7acfe81a09fdb6a96a3c75997a10b651667f6 - size: 534126 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml - original: lts-16.31 diff --git a/stack-lts-18.28.yaml.lock b/stack-lts-18.28.yaml.lock deleted file mode 100644 index 8aeeaea..0000000 --- a/stack-lts-18.28.yaml.lock +++ /dev/null @@ -1,61 +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: crypton-0.33@sha256:5e92f29b9b7104d91fcdda1dec9400c9ad1f1791c231cc41ceebd783fb517dee,18202 - pantry-tree: - sha256: 38809499d7f9775ef45cd29ab5c3dc9b283a813f34c1cdc56681b24f8cf8bb4f - size: 23148 - original: - hackage: crypton-0.33 -- completed: - hackage: crypton-connection-0.3.1@sha256:4d0958537197956b536ea91718b1749949757022532f50b8f683290056a19021,1581 - pantry-tree: - sha256: e35ac3a35611afab9fafac633d0c4e6328b9cce4c8262378671d6c5a739e7e70 - size: 394 - original: - hackage: crypton-connection-0.3.1 -- completed: - hackage: crypton-x509-1.7.6@sha256:c567657a705b6d6521f9dd2de999bf530d618ec00f3b939df76a41fb0fe94281,2339 - pantry-tree: - sha256: 729e7db8dfc0a8b43e08bbd8d1387c9065e39beda6ac39e0fb9f10140810a3eb - size: 1080 - original: - hackage: crypton-x509-1.7.6 -- completed: - hackage: crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750 - pantry-tree: - sha256: 87654d130a7f987ee139c821a1be45736d18df9fa4cb1142c4e054d3802338f3 - size: 406 - original: - hackage: crypton-x509-store-1.6.9 -- completed: - hackage: crypton-x509-system-1.6.7@sha256:023ed573d82983bc473a37a89e0434a085b413be9f68d07e085361056afd4637,1532 - pantry-tree: - sha256: c0ca49e6a9537f3fdb7b47c5cfe93f7d744a369bf9d089f3c668b9c2d97402b7 - size: 399 - original: - hackage: crypton-x509-system-1.6.7 -- completed: - hackage: crypton-x509-validation-1.6.12@sha256:85989721b64be4b90de9f66ef641c26f57575cffed1a50d707065fb60176f386,2227 - pantry-tree: - sha256: d4a0135f11218614fcd912cffaf54de8f749caca8696380e2589cbcfd64cc681 - size: 639 - original: - hackage: crypton-x509-validation-1.6.12 -- completed: - hackage: tls-1.7.0@sha256:fa82e9ca8fd887b66fba8433b3ba1db4e5e047fe7c815707f06209679d04177b,5566 - pantry-tree: - sha256: 7521091021ecbbbf9b46c2fdb08f9e449eddcebf3a3922f76d23baca5db83b4f - size: 4897 - original: - hackage: tls-1.7.0 -snapshots: -- completed: - sha256: 428ec8d5ce932190d3cbe266b9eb3c175cd81e984babf876b64019e2cbe4ea68 - size: 590100 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/28.yaml - original: lts-18.28 diff --git a/stack-lts-19.33.yaml.lock b/stack-lts-19.33.yaml.lock deleted file mode 100644 index 6e04c49..0000000 --- a/stack-lts-19.33.yaml.lock +++ /dev/null @@ -1,61 +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: crypton-0.33@sha256:5e92f29b9b7104d91fcdda1dec9400c9ad1f1791c231cc41ceebd783fb517dee,18202 - pantry-tree: - sha256: 38809499d7f9775ef45cd29ab5c3dc9b283a813f34c1cdc56681b24f8cf8bb4f - size: 23148 - original: - hackage: crypton-0.33 -- completed: - hackage: crypton-connection-0.3.1@sha256:4d0958537197956b536ea91718b1749949757022532f50b8f683290056a19021,1581 - pantry-tree: - sha256: e35ac3a35611afab9fafac633d0c4e6328b9cce4c8262378671d6c5a739e7e70 - size: 394 - original: - hackage: crypton-connection-0.3.1 -- completed: - hackage: crypton-x509-1.7.6@sha256:c567657a705b6d6521f9dd2de999bf530d618ec00f3b939df76a41fb0fe94281,2339 - pantry-tree: - sha256: 729e7db8dfc0a8b43e08bbd8d1387c9065e39beda6ac39e0fb9f10140810a3eb - size: 1080 - original: - hackage: crypton-x509-1.7.6 -- completed: - hackage: crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750 - pantry-tree: - sha256: 87654d130a7f987ee139c821a1be45736d18df9fa4cb1142c4e054d3802338f3 - size: 406 - original: - hackage: crypton-x509-store-1.6.9 -- completed: - hackage: crypton-x509-system-1.6.7@sha256:023ed573d82983bc473a37a89e0434a085b413be9f68d07e085361056afd4637,1532 - pantry-tree: - sha256: c0ca49e6a9537f3fdb7b47c5cfe93f7d744a369bf9d089f3c668b9c2d97402b7 - size: 399 - original: - hackage: crypton-x509-system-1.6.7 -- completed: - hackage: crypton-x509-validation-1.6.12@sha256:85989721b64be4b90de9f66ef641c26f57575cffed1a50d707065fb60176f386,2227 - pantry-tree: - sha256: d4a0135f11218614fcd912cffaf54de8f749caca8696380e2589cbcfd64cc681 - size: 639 - original: - hackage: crypton-x509-validation-1.6.12 -- completed: - hackage: tls-1.7.0@sha256:fa82e9ca8fd887b66fba8433b3ba1db4e5e047fe7c815707f06209679d04177b,5566 - pantry-tree: - sha256: 7521091021ecbbbf9b46c2fdb08f9e449eddcebf3a3922f76d23baca5db83b4f - size: 4897 - original: - hackage: tls-1.7.0 -snapshots: -- completed: - sha256: 6d1532d40621957a25bad5195bfca7938e8a06d923c91bc52aa0f3c41181f2d4 - size: 619204 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/33.yaml - original: lts-19.33 diff --git a/stack-lts-20.26.yaml.lock b/stack-lts-20.26.yaml.lock deleted file mode 100644 index 947209c..0000000 --- a/stack-lts-20.26.yaml.lock +++ /dev/null @@ -1,61 +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: crypton-0.33@sha256:5e92f29b9b7104d91fcdda1dec9400c9ad1f1791c231cc41ceebd783fb517dee,18202 - pantry-tree: - sha256: 38809499d7f9775ef45cd29ab5c3dc9b283a813f34c1cdc56681b24f8cf8bb4f - size: 23148 - original: - hackage: crypton-0.33 -- completed: - hackage: crypton-connection-0.3.1@sha256:4d0958537197956b536ea91718b1749949757022532f50b8f683290056a19021,1581 - pantry-tree: - sha256: e35ac3a35611afab9fafac633d0c4e6328b9cce4c8262378671d6c5a739e7e70 - size: 394 - original: - hackage: crypton-connection-0.3.1 -- completed: - hackage: crypton-x509-1.7.6@sha256:c567657a705b6d6521f9dd2de999bf530d618ec00f3b939df76a41fb0fe94281,2339 - pantry-tree: - sha256: 729e7db8dfc0a8b43e08bbd8d1387c9065e39beda6ac39e0fb9f10140810a3eb - size: 1080 - original: - hackage: crypton-x509-1.7.6 -- completed: - hackage: crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750 - pantry-tree: - sha256: 87654d130a7f987ee139c821a1be45736d18df9fa4cb1142c4e054d3802338f3 - size: 406 - original: - hackage: crypton-x509-store-1.6.9 -- completed: - hackage: crypton-x509-system-1.6.7@sha256:023ed573d82983bc473a37a89e0434a085b413be9f68d07e085361056afd4637,1532 - pantry-tree: - sha256: c0ca49e6a9537f3fdb7b47c5cfe93f7d744a369bf9d089f3c668b9c2d97402b7 - size: 399 - original: - hackage: crypton-x509-system-1.6.7 -- completed: - hackage: crypton-x509-validation-1.6.12@sha256:85989721b64be4b90de9f66ef641c26f57575cffed1a50d707065fb60176f386,2227 - pantry-tree: - sha256: d4a0135f11218614fcd912cffaf54de8f749caca8696380e2589cbcfd64cc681 - size: 639 - original: - hackage: crypton-x509-validation-1.6.12 -- completed: - hackage: tls-1.7.0@sha256:fa82e9ca8fd887b66fba8433b3ba1db4e5e047fe7c815707f06209679d04177b,5566 - pantry-tree: - sha256: 7521091021ecbbbf9b46c2fdb08f9e449eddcebf3a3922f76d23baca5db83b4f - size: 4897 - original: - hackage: tls-1.7.0 -snapshots: -- completed: - sha256: 5a59b2a405b3aba3c00188453be172b85893cab8ebc352b1ef58b0eae5d248a2 - size: 650475 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml - original: lts-20.26 diff --git a/stack-lts-21.25.yaml.lock b/stack-lts-21.25.yaml.lock deleted file mode 100644 index 5fa4b25..0000000 --- a/stack-lts-21.25.yaml.lock +++ /dev/null @@ -1,54 +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: crypton-connection-0.3.1@sha256:4d0958537197956b536ea91718b1749949757022532f50b8f683290056a19021,1581 - pantry-tree: - sha256: e35ac3a35611afab9fafac633d0c4e6328b9cce4c8262378671d6c5a739e7e70 - size: 394 - original: - hackage: crypton-connection-0.3.1 -- completed: - hackage: crypton-x509-1.7.6@sha256:c567657a705b6d6521f9dd2de999bf530d618ec00f3b939df76a41fb0fe94281,2339 - pantry-tree: - sha256: 729e7db8dfc0a8b43e08bbd8d1387c9065e39beda6ac39e0fb9f10140810a3eb - size: 1080 - original: - hackage: crypton-x509-1.7.6 -- completed: - hackage: crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750 - pantry-tree: - sha256: 87654d130a7f987ee139c821a1be45736d18df9fa4cb1142c4e054d3802338f3 - size: 406 - original: - hackage: crypton-x509-store-1.6.9 -- completed: - hackage: crypton-x509-system-1.6.7@sha256:023ed573d82983bc473a37a89e0434a085b413be9f68d07e085361056afd4637,1532 - pantry-tree: - sha256: c0ca49e6a9537f3fdb7b47c5cfe93f7d744a369bf9d089f3c668b9c2d97402b7 - size: 399 - original: - hackage: crypton-x509-system-1.6.7 -- completed: - hackage: crypton-x509-validation-1.6.12@sha256:85989721b64be4b90de9f66ef641c26f57575cffed1a50d707065fb60176f386,2227 - pantry-tree: - sha256: d4a0135f11218614fcd912cffaf54de8f749caca8696380e2589cbcfd64cc681 - size: 639 - original: - hackage: crypton-x509-validation-1.6.12 -- completed: - hackage: tls-1.7.0@sha256:fa82e9ca8fd887b66fba8433b3ba1db4e5e047fe7c815707f06209679d04177b,5566 - pantry-tree: - sha256: 7521091021ecbbbf9b46c2fdb08f9e449eddcebf3a3922f76d23baca5db83b4f - size: 4897 - original: - hackage: tls-1.7.0 -snapshots: -- completed: - sha256: a81fb3877c4f9031e1325eb3935122e608d80715dc16b586eb11ddbff8671ecd - size: 640086 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/25.yaml - original: lts-21.25 diff --git a/stack-lts-16.31.yaml b/stack-lts16.yaml similarity index 100% rename from stack-lts-16.31.yaml rename to stack-lts16.yaml diff --git a/stack-lts-18.28.yaml b/stack-lts18.yaml similarity index 100% rename from stack-lts-18.28.yaml rename to stack-lts18.yaml diff --git a/stack-lts-19.33.yaml b/stack-lts19.yaml similarity index 100% rename from stack-lts-19.33.yaml rename to stack-lts19.yaml diff --git a/stack-lts-20.26.yaml b/stack-lts20.yaml similarity index 100% rename from stack-lts-20.26.yaml rename to stack-lts20.yaml diff --git a/stack-lts-21.25.yaml b/stack-lts21.yaml similarity index 100% rename from stack-lts-21.25.yaml rename to stack-lts21.yaml diff --git a/stack-lts22.yaml b/stack-lts22.yaml new file mode 100644 index 0000000..c757eef --- /dev/null +++ b/stack-lts22.yaml @@ -0,0 +1 @@ +resolver: lts-22.43 diff --git a/stack-lts23.yaml b/stack-lts23.yaml new file mode 100644 index 0000000..cf8ed23 --- /dev/null +++ b/stack-lts23.yaml @@ -0,0 +1 @@ +resolver: lts-23.3 diff --git a/stack-nightly.yaml.lock b/stack-nightly.yaml.lock deleted file mode 100644 index 905ee91..0000000 --- a/stack-nightly.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: eaf7fa19aa69d7e09d476232dab96dfc9c929dbc67f8a72aa38ec8b7b3827557 - size: 529494 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/1/2.yaml - original: nightly-2024-01-02 diff --git a/stack.yaml b/stack.yaml index 2d0dc93..cf8ed23 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1 +1 @@ -resolver: lts-22.4 +resolver: lts-23.3 diff --git a/stack.yaml.lock b/stack.yaml.lock index f71a69f..896cbb2 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -1,12 +1,12 @@ # 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: [] snapshots: - completed: - sha256: 8b211c5a6aad3787e023dfddaf7de7868968e4f240ecedf14ad1c5b2199046ca - size: 714097 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/4.yaml - original: lts-22.4 + sha256: dd89d2322cb5af74c6ab9d96c0c5f6c8e6653e0c991d619b4bb141a49cb98668 + size: 679282 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/23/3.yaml + original: lts-23.3