Bump the version of hpack to 0.34.6, bump the test GHC versions.

cabalism · Dec 17, 2021 · b2126d0 · b2126d0
1 parent 4792671
commit b2126d0
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 56 deletions.
diff --git a/.github/workflows/cabal.yml b/.github/workflows/cabal.yml
@@ -12,10 +12,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        cabal: ["3.4"]
+        cabal: ["3.6"]
         ghc:
-          - "8.10.4"
           - "8.8.4"
+          - "8.10.7"
+          - "9.0.1"
 
     steps:
     - uses: actions/checkout@v2

diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml
@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        cabal: ["3.4"]
+        cabal: ["3.6"]
         ghc:
-          - "8.10.4"
+          - "9.0.1"
 
     steps:
     - uses: actions/checkout@v2

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 The [latest version](https://github.com/blockscope/hpack-dhall/blob/master/changelog.md) of this changelog.
 
+## 0.5.4 - Rewrite the README
+* Require `hpack >= 0.34.6`.
+* Test with GHC `8.8.4`, GHC `8.10.7` and GHC `9.0.1`.
+
 ## 0.5.3 - Rewrite the README
 * Rewrite the README, making it shorter and splitting some details about more
   uses and building into separate docs.

diff --git a/hpack-dhall.cabal b/hpack-dhall.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.dhall by hpack version 0.34.5.
+-- This file has been generated from package.dhall by hpack version 0.34.6.
 --
 -- see: https://github.com/sol/hpack
 
@@ -27,7 +27,7 @@ license:        BSD3
 license-file:   LICENSE
 build-type:     Simple
 tested-with:
-    GHC == 8.8.4, GHC == 8.10.7
+    GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.1
 extra-source-files:
     package.dhall
     changelog.md

diff --git a/package.dhall b/package.dhall
@@ -41,7 +41,7 @@ in  let exe-deps = [ "optparse-applicative" ]
             and functions.
             ''
         , github = "cabalism/hpack-dhall"
-        , tested-with = "GHC == 8.8.4, GHC == 8.10.7"
+        , tested-with = "GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.1"
         , extra-source-files =
           [ "package.dhall"
           , "changelog.md"

diff --git a/stack.yaml b/stack.yaml
@@ -1,3 +1,3 @@
-resolver: lts-18.5
+resolver: nightly-2021-12-16
 packages:
 - '.'
diff --git a/stack.yaml.lock b/stack.yaml.lock
@@ -6,7 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    size: 585817
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/5.yaml
-    sha256: 22d24d0dacad9c1450b9a174c28d203f9bb482a2a8da9710a2f2a9f4afee2887
-  original: lts-18.5
+    size: 611461
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2021/12/16.yaml
+    sha256: 49c66c033e37b259f86219619c27394fa462d1ab18d31e85fbaedfb40262aa28
+  original: nightly-2021-12-16
diff --git a/stack/stack-8.10.4.yaml b/stack/stack-8.10.4.yaml
diff --git a/stack/stack-8.10.4.yaml.lock b/stack/stack-8.10.4.yaml.lock
diff --git a/stack/stack-8.8.4.yaml b/stack/stack-8.8.4.yaml
diff --git a/stack/stack-8.8.4.yaml.lock b/stack/stack-8.8.4.yaml.lock
diff --git a/stack/stack-9.0.1.yaml b/stack/stack-9.0.1.yaml
@@ -1,3 +1,3 @@
-resolver: nightly-2021-08-08
+resolver: nightly-2021-12-16
 packages:
 - '../'
diff --git a/stack/stack-9.0.1.yaml.lock b/stack/stack-9.0.1.yaml.lock
@@ -6,7 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    size: 468990
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2021/6/20.yaml
-    sha256: 103b65064332ba9a92c52101ce6b46c577ef4f8c0eed92fb7c52847719965b81
-  original: nightly-2021-06-20
+    size: 611461
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2021/12/16.yaml
+    sha256: 49c66c033e37b259f86219619c27394fa462d1ab18d31e85fbaedfb40262aa28
+  original: nightly-2021-12-16