From eae7438e1375b50e2c9b1dcdf043b1ecdcf1e43a Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Sat, 6 Jan 2024 18:55:21 +0000 Subject: [PATCH] Bump lower bound on tar-conduit and bump CI --- .github/workflows/tests.yml | 10 +++++----- package.yaml | 2 +- pantry.cabal | 8 ++++---- stack-ghc-9.2.8.yaml | 2 +- stack-ghc-9.4.8.yaml | 2 +- stack-ghc-9.6.3.yaml | 7 ++++++- stack-ghc-9.8.1.yaml | 11 +++++------ stack.yaml.lock | 17 ++++++++++++----- 8 files changed, 35 insertions(+), 24 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5ca391c0..73ccfa7a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,7 +7,7 @@ on: - master workflow_dispatch: -# As of 18 December 2023, ubuntu-latest, windows-latest and macos-latest come +# As of 6 January 2024, ubuntu-latest, windows-latest and macos-latest come # with Stack 2.13.1. jobs: @@ -20,14 +20,14 @@ jobs: os: - ubuntu-latest resolver: - - stack-ghc-9.2.8.yaml - stack-ghc-9.4.8.yaml - stack-ghc-9.6.3.yaml + - stack-ghc-9.8.1.yaml include: - os: macos-latest - resolver: stack-ghc-9.6.3.yaml + resolver: stack-ghc-9.8.1.yaml - os: windows-latest - resolver: stack-ghc-9.6.3.yaml + resolver: stack-ghc-9.8.1.yaml steps: - name: Clone project uses: actions/checkout@v4 @@ -60,7 +60,7 @@ jobs: - ubuntu-latest - windows-latest resolver: - - stack-ghc-9.6.3.yaml + - stack-ghc-9.8.1.yaml steps: - name: Clone project uses: actions/checkout@v4 diff --git a/package.yaml b/package.yaml index 8a964646..7dabd7b0 100644 --- a/package.yaml +++ b/package.yaml @@ -62,7 +62,7 @@ dependencies: - rio-orphans - rio-prettyprint >= 0.1.7.0 - static-bytes -- tar-conduit >= 0.4.0 +- tar-conduit >= 0.4.1 - text - text-metrics - time diff --git a/pantry.cabal b/pantry.cabal index 215b89b2..5f9af631 100644 --- a/pantry.cabal +++ b/pantry.cabal @@ -93,7 +93,7 @@ library , rio-orphans , rio-prettyprint >=0.1.7.0 , static-bytes - , tar-conduit >=0.4.0 + , tar-conduit >=0.4.1 , text , text-metrics , time @@ -171,7 +171,7 @@ library internal , rio-orphans , rio-prettyprint >=0.1.7.0 , static-bytes - , tar-conduit >=0.4.0 + , tar-conduit >=0.4.1 , text , text-metrics , time @@ -237,7 +237,7 @@ executable test-pretty-exceptions , rio-orphans , rio-prettyprint >=0.1.7.0 , static-bytes - , tar-conduit >=0.4.0 + , tar-conduit >=0.4.1 , text , text-metrics , time @@ -338,7 +338,7 @@ test-suite spec , rio-orphans , rio-prettyprint >=0.1.7.0 , static-bytes - , tar-conduit >=0.4.0 + , tar-conduit >=0.4.1 , text , text-metrics , time diff --git a/stack-ghc-9.2.8.yaml b/stack-ghc-9.2.8.yaml index 0095fb2f..036cce35 100644 --- a/stack-ghc-9.2.8.yaml +++ b/stack-ghc-9.2.8.yaml @@ -23,7 +23,7 @@ packages: - rio-prettyprint-0.1.7.0@sha256:4f0f2dabcbc3be1f9871de7c2ff3d090b82462ca5924afa24f7b2540c5511d84,1428 - static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627 # lts-20.26 provides tar-conduit-0.3.2 -- tar-conduit-0.4.0@sha256:f333649770f5ec42a83a93b0d424cf6bb895d80dfbee05a54340395f81d036ae,3126 +- tar-conduit-0.4.1@sha256:112d28118eb71901ea9e224e1b174c648b378256729669c2739b8b803d25b43a,3126 # crypton-connection-0.3.1 requires tls >= 1.7. lts-20.26 provides tls-1.5.8 - tls-1.8.0@sha256:0ea435fb1969384c76e6b6ba49c509cec55eec29f60dd2c335151d9c8a4e8b4f,5571 diff --git a/stack-ghc-9.4.8.yaml b/stack-ghc-9.4.8.yaml index bbd2ba67..9e8062ff 100644 --- a/stack-ghc-9.4.8.yaml +++ b/stack-ghc-9.4.8.yaml @@ -17,7 +17,7 @@ packages: - http-download-0.2.1.0@sha256:a97863e96f7d44efc3d0e3061db7fe2540b8374ca44ae90d0b56040140cb7506,1716 - static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627 # lts-21.25 provides tar-conduit-0.3.2.1 -- tar-conduit-0.4.0@sha256:f333649770f5ec42a83a93b0d424cf6bb895d80dfbee05a54340395f81d036ae,3126 +- tar-conduit-0.4.1@sha256:112d28118eb71901ea9e224e1b174c648b378256729669c2739b8b803d25b43a,3126 # crypton-connection-0.3.1 requires tls >= 1.7. lts-21.25 provides tls-1.6.0 - tls-1.8.0@sha256:0ea435fb1969384c76e6b6ba49c509cec55eec29f60dd2c335151d9c8a4e8b4f,5571 diff --git a/stack-ghc-9.6.3.yaml b/stack-ghc-9.6.3.yaml index 8f5b8aeb..8c882999 100644 --- a/stack-ghc-9.6.3.yaml +++ b/stack-ghc-9.6.3.yaml @@ -1,5 +1,10 @@ # Snapshot specification for GHC 9.6.3. -resolver: lts-22.0 # GHC 9.6.3 +resolver: lts-22.4 # GHC 9.6.3 + +packages: +# lts-22.4 provides tar-conduit-0.4.0 +- tar-conduit-0.4.1@sha256:112d28118eb71901ea9e224e1b174c648b378256729669c2739b8b803d25b43a,3126 + flags: hackage-security: diff --git a/stack-ghc-9.8.1.yaml b/stack-ghc-9.8.1.yaml index c0d9ba7c..b2a261d2 100644 --- a/stack-ghc-9.8.1.yaml +++ b/stack-ghc-9.8.1.yaml @@ -1,11 +1,10 @@ -# Experimental snapshot specification for GHC 9.8.1. -resolver: nightly-2023-12-18 # GHC 9.6.3 -compiler: ghc-9.8.1 +# Snapshot specification for GHC 9.8.1. +resolver: nightly-2024-01-06 # GHC 9.8.1 packages: -- aeson-2.2.1.0@sha256:a23a61aada8233e10573e1612c0b2efe5a1aba0d59b05dbe2f63301822f136cb,6582 -- attoparsec-aeson-2.2.0.1@sha256:00026bb205aaa087215a4c3a65a62c4561c3fb58e882778c9607c63e2aa960e9,1593 -- th-abstraction-0.6.0.0@sha256:d8959fa6a2812afcdd5f6f255fd6be8b3e0ca01e425586a554544fcb70b0ec7c,2303 +- hedgehog-1.4@sha256:47633efec27b49fe5a21d51f3b9fce428ca4b945d39eaa163b2b6a1d3e1465be,4724 +# nightly-2024-01-06 provides tar-conduit-0.4.0 +- tar-conduit-0.4.1@sha256:112d28118eb71901ea9e224e1b174c648b378256729669c2739b8b803d25b43a,3126 flags: hackage-security: diff --git a/stack.yaml.lock b/stack.yaml.lock index ff660137..7acf3ff3 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -3,10 +3,17 @@ # For more information, please see the documentation at: # https://docs.haskellstack.org/en/stable/lock_files -packages: [] +packages: +- completed: + hackage: tar-conduit-0.4.1@sha256:112d28118eb71901ea9e224e1b174c648b378256729669c2739b8b803d25b43a,3126 + pantry-tree: + sha256: ef68ea6504605689648cd26a461e855247ac66518a0caf615af2d97fdfe9ceef + size: 828 + original: + hackage: tar-conduit-0.4.1@sha256:112d28118eb71901ea9e224e1b174c648b378256729669c2739b8b803d25b43a,3126 snapshots: - completed: - sha256: e176944bc843f740e05242fa7a66ca1f440c127e425254f7f1257f9b19add23f - size: 712153 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/0.yaml - original: lts-22.0 + sha256: 8b211c5a6aad3787e023dfddaf7de7868968e4f240ecedf14ad1c5b2199046ca + size: 714097 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/4.yaml + original: lts-22.4