Updates to GHC 9.6

flipstone · May 16, 2024 · 7b1e4c3 · 7b1e4c3
1 parent e24fc93
commit 7b1e4c3
Show file tree

Hide file tree

Showing 15 changed files with 74 additions and 74 deletions.
diff --git a/compose.yml b/compose.yml
@@ -1,6 +1,6 @@
 services:
   dev:
-    image: ghcr.io/flipstone/haskell-tools:debian-stable-ghc-9.4.7-2023-10-31-3286ef4
+    image: ghcr.io/flipstone/haskell-tools:debian-stable-ghc-9.6.5-2024-05-15-5314c42
     volumes:
       - .:${PROJECT_DIR}
       - flipstone_stack_root:/stack-root

diff --git a/json-fleece-codegen-util/json-fleece-codegen-util.cabal b/json-fleece-codegen-util/json-fleece-codegen-util.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           json-fleece-codegen-util
-version:        0.9.1.0
+version:        0.9.1.1
 description:    Please see the README on GitHub at <https://github.com/githubuser/json-fleece-codegen-util#readme>
 homepage:       https://github.com/flipstone/json-fleece#readme
 bug-reports:    https://github.com/flipstone/json-fleece/issues
@@ -43,14 +43,14 @@ library
     , base >=4.7 && <5
     , bytestring ==0.11.*
     , containers ==0.6.*
-    , dhall ==1.41.*
+    , dhall >=1.41 && <1.43
     , directory ==1.3.*
     , file-embed ==0.0.*
     , filepath ==1.4.*
     , isocline ==1.0.*
-    , mtl ==2.2.*
+    , mtl >=2.2 && <2.4
     , non-empty-text ==0.2.*
-    , optparse-applicative ==0.17.*
+    , optparse-applicative >=0.17 && <0.19
     , text >=1.2 && <2.1
     , text-manipulate ==0.3.*
     , yaml ==0.11.*

diff --git a/json-fleece-codegen-util/package.yaml b/json-fleece-codegen-util/package.yaml
@@ -1,5 +1,5 @@
 name:                json-fleece-codegen-util
-version:             0.9.1.0
+version:             0.9.1.1
 github:              "flipstone/json-fleece/json-fleece-codegen-util"
 license:             BSD3
 author:              "Author name here"
@@ -20,14 +20,14 @@ dependencies:
 - aeson >= 2.0 && < 2.2
 - bytestring >= 0.11 && < 0.12
 - containers >= 0.6 && < 0.7
-- dhall >= 1.41 &&  < 1.42
+- dhall >= 1.41 &&  < 1.43
 - directory >= 1.3 && < 1.4
 - file-embed >= 0.0 &&  < 0.1
 - filepath >= 1.4 && < 1.5
 - isocline >= 1.0 && < 1.1
-- mtl >= 2.2 && < 2.3
+- mtl >= 2.2 && < 2.4
 - non-empty-text >= 0.2 && < 0.3
-- optparse-applicative >= 0.17 && < 0.18
+- optparse-applicative >= 0.17 && < 0.19
 - text >= 1.2 && < 2.1
 - text-manipulate >= 0.3 && < 0.4
 - yaml >= 0.11 && < 0.12

diff --git a/json-fleece-openapi3/examples/star-trek/stack.yaml b/json-fleece-openapi3/examples/star-trek/stack.yaml
@@ -1,5 +1,5 @@
 resolver:
-  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/19.yaml
+  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/22.yaml
 system-ghc: true
 install-ghc: false
 
@@ -28,12 +28,12 @@ extra-deps:
   - ../../../json-fleece-aeson
   - ../../../json-fleece-aeson-beeline
   - git: https://github.com/flipstone/beeline
-    commit: 5545ee24e04cebd2182a924033fa174381591107
+    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
     subdirs:
       - beeline-routing
       - beeline-http-client
   - git: https://github.com/flipstone/shrubbery
-    commit: 730255546c2eb99071380db44b5e349318dead68
+    commit: e64d5494205e32a3bef421392ba8c7f8f758bfe9
   - non-empty-text-0.2.0@sha256:7d1c1f9a11c78c00c656269f940d2fcccd3c2eaf6b619f66bb83a9ea72decc1f,2438
 
 # Override default flag values for local packages and extra-deps

diff --git a/json-fleece-openapi3/examples/star-trek/stack.yaml.lock b/json-fleece-openapi3/examples/star-trek/stack.yaml.lock
@@ -5,7 +5,7 @@
 
 packages:
 - completed:
-    commit: 5545ee24e04cebd2182a924033fa174381591107
+    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
     git: https://github.com/flipstone/beeline
     name: beeline-routing
     pantry-tree:
@@ -14,11 +14,11 @@ packages:
     subdir: beeline-routing
     version: 0.2.4.0
   original:
-    commit: 5545ee24e04cebd2182a924033fa174381591107
+    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
     git: https://github.com/flipstone/beeline
     subdir: beeline-routing
 - completed:
-    commit: 5545ee24e04cebd2182a924033fa174381591107
+    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
     git: https://github.com/flipstone/beeline
     name: beeline-http-client
     pantry-tree:
@@ -27,19 +27,19 @@ packages:
     subdir: beeline-http-client
     version: 0.8.0.0
   original:
-    commit: 5545ee24e04cebd2182a924033fa174381591107
+    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
     git: https://github.com/flipstone/beeline
     subdir: beeline-http-client
 - completed:
-    commit: 730255546c2eb99071380db44b5e349318dead68
+    commit: e64d5494205e32a3bef421392ba8c7f8f758bfe9
     git: https://github.com/flipstone/shrubbery
     name: shrubbery
     pantry-tree:
-      sha256: f6778fb34b67dd92ed69d302377b1873a29ce8b29bae5ffcca4ef3bb20f11dd4
+      sha256: cdae23a1203bf79e59969ea294bcaf94abf37f7f684d3a1107b25ffe5efc678e
       size: 1737
     version: 0.2.0.0
   original:
-    commit: 730255546c2eb99071380db44b5e349318dead68
+    commit: e64d5494205e32a3bef421392ba8c7f8f758bfe9
     git: https://github.com/flipstone/shrubbery
 - completed:
     hackage: non-empty-text-0.2.0@sha256:7d1c1f9a11c78c00c656269f940d2fcccd3c2eaf6b619f66bb83a9ea72decc1f,2438
@@ -50,8 +50,8 @@ packages:
     hackage: non-empty-text-0.2.0@sha256:7d1c1f9a11c78c00c656269f940d2fcccd3c2eaf6b619f66bb83a9ea72decc1f,2438
 snapshots:
 - completed:
-    sha256: fb482b8e2d5d061cdda4ba1da2957c012740c893a5ee1c1b99001adae7b1fbe7
-    size: 640046
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/19.yaml
+    sha256: 4be1ca5d31689b524a7f0f17a439bbe9136465213edc498e9a395899a670f2aa
+    size: 718486
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/22.yaml
   original:
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/19.yaml
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/22.yaml
diff --git a/json-fleece-openapi3/examples/test-cases/stack.yaml b/json-fleece-openapi3/examples/test-cases/stack.yaml
@@ -1,5 +1,5 @@
 resolver:
-  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/19.yaml
+  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/22.yaml
 system-ghc: true
 install-ghc: false
 
@@ -28,12 +28,12 @@ extra-deps:
   - ../../../json-fleece-aeson
   - ../../../json-fleece-aeson-beeline
   - git: https://github.com/flipstone/beeline
-    commit: 5545ee24e04cebd2182a924033fa174381591107
+    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
     subdirs:
       - beeline-routing
       - beeline-http-client
   - git: https://github.com/flipstone/shrubbery
-    commit: 730255546c2eb99071380db44b5e349318dead68
+    commit: e64d5494205e32a3bef421392ba8c7f8f758bfe9
   - non-empty-text-0.2.0@sha256:7d1c1f9a11c78c00c656269f940d2fcccd3c2eaf6b619f66bb83a9ea72decc1f,2438
 
 # Override default flag values for local packages and extra-deps

diff --git a/json-fleece-openapi3/examples/test-cases/stack.yaml.lock b/json-fleece-openapi3/examples/test-cases/stack.yaml.lock
@@ -5,7 +5,7 @@
 
 packages:
 - completed:
-    commit: 5545ee24e04cebd2182a924033fa174381591107
+    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
     git: https://github.com/flipstone/beeline
     name: beeline-routing
     pantry-tree:
@@ -14,11 +14,11 @@ packages:
     subdir: beeline-routing
     version: 0.2.4.0
   original:
-    commit: 5545ee24e04cebd2182a924033fa174381591107
+    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
     git: https://github.com/flipstone/beeline
     subdir: beeline-routing
 - completed:
-    commit: 5545ee24e04cebd2182a924033fa174381591107
+    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
     git: https://github.com/flipstone/beeline
     name: beeline-http-client
     pantry-tree:
@@ -27,19 +27,19 @@ packages:
     subdir: beeline-http-client
     version: 0.8.0.0
   original:
-    commit: 5545ee24e04cebd2182a924033fa174381591107
+    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
     git: https://github.com/flipstone/beeline
     subdir: beeline-http-client
 - completed:
-    commit: 730255546c2eb99071380db44b5e349318dead68
+    commit: e64d5494205e32a3bef421392ba8c7f8f758bfe9
     git: https://github.com/flipstone/shrubbery
     name: shrubbery
     pantry-tree:
-      sha256: f6778fb34b67dd92ed69d302377b1873a29ce8b29bae5ffcca4ef3bb20f11dd4
+      sha256: cdae23a1203bf79e59969ea294bcaf94abf37f7f684d3a1107b25ffe5efc678e
       size: 1737
     version: 0.2.0.0
   original:
-    commit: 730255546c2eb99071380db44b5e349318dead68
+    commit: e64d5494205e32a3bef421392ba8c7f8f758bfe9
     git: https://github.com/flipstone/shrubbery
 - completed:
     hackage: non-empty-text-0.2.0@sha256:7d1c1f9a11c78c00c656269f940d2fcccd3c2eaf6b619f66bb83a9ea72decc1f,2438
@@ -50,8 +50,8 @@ packages:
     hackage: non-empty-text-0.2.0@sha256:7d1c1f9a11c78c00c656269f940d2fcccd3c2eaf6b619f66bb83a9ea72decc1f,2438
 snapshots:
 - completed:
-    sha256: fb482b8e2d5d061cdda4ba1da2957c012740c893a5ee1c1b99001adae7b1fbe7
-    size: 640046
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/19.yaml
+    sha256: 4be1ca5d31689b524a7f0f17a439bbe9136465213edc498e9a395899a670f2aa
+    size: 718486
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/22.yaml
   original:
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/19.yaml
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/22.yaml
diff --git a/json-fleece-openapi3/json-fleece-openapi3.cabal b/json-fleece-openapi3/json-fleece-openapi3.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           json-fleece-openapi3
-version:        0.4.3.0
+version:        0.4.3.1
 description:    Please see the README on GitHub at <https://github.com/flipstone/json-fleece-openapi3#readme>
 homepage:       https://github.com/flipstone/json-fleece#readme
 bug-reports:    https://github.com/flipstone/json-fleece/issues
@@ -2056,7 +2056,7 @@ library
     , containers ==0.6.*
     , insert-ordered-containers ==0.2.*
     , json-fleece-codegen-util ==0.9.*
-    , mtl ==2.2.*
+    , mtl >=2.2 && <2.4
     , non-empty-text ==0.2.*
     , openapi3 ==3.2.*
     , text >=1.2 && <2.1
@@ -2094,7 +2094,7 @@ test-suite json-fleece-openapi3-test
   build-depends:
       base >=4.7 && <5
     , bytestring ==0.11.*
-    , file-embed ==0.0.15.*
+    , file-embed >=0.0.15 && <0.0.17
     , hedgehog
     , json-fleece-codegen-util ==0.9.*
     , json-fleece-openapi3

diff --git a/json-fleece-openapi3/package.yaml b/json-fleece-openapi3/package.yaml
@@ -1,5 +1,5 @@
 name:                json-fleece-openapi3
-version:             0.4.3.0
+version:             0.4.3.1
 github:              "flipstone/json-fleece/json-fleece-openapi3"
 license:             BSD3
 author:              "Author name here"
@@ -63,7 +63,7 @@ library:
     - aeson >= 2.0 && < 2.2
     - insert-ordered-containers >= 0.2 && < 0.3
     - containers >= 0.6 && < 0.7
-    - mtl >= 2.2 && < 2.3
+    - mtl >= 2.2 && < 2.4
     - non-empty-text >= 0.2 && < 0.3
     - openapi3 >= 3.2 && < 3.3
     - text >= 1.2 && < 2.1
@@ -90,5 +90,5 @@ tests:
       - json-fleece-openapi3
       - hedgehog
       - bytestring >= 0.11 && < 0.12
-      - file-embed >= 0.0.15 && < 0.0.16
+      - file-embed >= 0.0.15 && < 0.0.17
       - yaml >= 0.11 && < 0.12
diff --git a/json-fleece-swagger2/examples/uber/stack.yaml b/json-fleece-swagger2/examples/uber/stack.yaml
@@ -1,5 +1,5 @@
 resolver:
-  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/19.yaml
+  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/22.yaml
 system-ghc: true
 install-ghc: false
 
@@ -28,12 +28,12 @@ extra-deps:
   - ../../../json-fleece-aeson
   - ../../../json-fleece-aeson-beeline
   - git: https://github.com/flipstone/beeline
-    commit: 5545ee24e04cebd2182a924033fa174381591107
+    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
     subdirs:
       - beeline-routing
       - beeline-http-client
   - git: https://github.com/flipstone/shrubbery
-    commit: 730255546c2eb99071380db44b5e349318dead68
+    commit: e64d5494205e32a3bef421392ba8c7f8f758bfe9
   - non-empty-text-0.2.0@sha256:7d1c1f9a11c78c00c656269f940d2fcccd3c2eaf6b619f66bb83a9ea72decc1f,2438
 
 # Override default flag values for local packages and extra-deps

diff --git a/json-fleece-swagger2/examples/uber/stack.yaml.lock b/json-fleece-swagger2/examples/uber/stack.yaml.lock
@@ -5,7 +5,7 @@
 
 packages:
 - completed:
-    commit: 5545ee24e04cebd2182a924033fa174381591107
+    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
     git: https://github.com/flipstone/beeline
     name: beeline-routing
     pantry-tree:
@@ -14,11 +14,11 @@ packages:
     subdir: beeline-routing
     version: 0.2.4.0
   original:
-    commit: 5545ee24e04cebd2182a924033fa174381591107
+    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
     git: https://github.com/flipstone/beeline
     subdir: beeline-routing
 - completed:
-    commit: 5545ee24e04cebd2182a924033fa174381591107
+    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
     git: https://github.com/flipstone/beeline
     name: beeline-http-client
     pantry-tree:
@@ -27,19 +27,19 @@ packages:
     subdir: beeline-http-client
     version: 0.8.0.0
   original:
-    commit: 5545ee24e04cebd2182a924033fa174381591107
+    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
     git: https://github.com/flipstone/beeline
     subdir: beeline-http-client
 - completed:
-    commit: 730255546c2eb99071380db44b5e349318dead68
+    commit: e64d5494205e32a3bef421392ba8c7f8f758bfe9
     git: https://github.com/flipstone/shrubbery
     name: shrubbery
     pantry-tree:
-      sha256: f6778fb34b67dd92ed69d302377b1873a29ce8b29bae5ffcca4ef3bb20f11dd4
+      sha256: cdae23a1203bf79e59969ea294bcaf94abf37f7f684d3a1107b25ffe5efc678e
       size: 1737
     version: 0.2.0.0
   original:
-    commit: 730255546c2eb99071380db44b5e349318dead68
+    commit: e64d5494205e32a3bef421392ba8c7f8f758bfe9
     git: https://github.com/flipstone/shrubbery
 - completed:
     hackage: non-empty-text-0.2.0@sha256:7d1c1f9a11c78c00c656269f940d2fcccd3c2eaf6b619f66bb83a9ea72decc1f,2438
@@ -50,8 +50,8 @@ packages:
     hackage: non-empty-text-0.2.0@sha256:7d1c1f9a11c78c00c656269f940d2fcccd3c2eaf6b619f66bb83a9ea72decc1f,2438
 snapshots:
 - completed:
-    sha256: fb482b8e2d5d061cdda4ba1da2957c012740c893a5ee1c1b99001adae7b1fbe7
-    size: 640046
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/19.yaml
+    sha256: 4be1ca5d31689b524a7f0f17a439bbe9136465213edc498e9a395899a670f2aa
+    size: 718486
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/22.yaml
   original:
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/19.yaml
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/22.yaml
diff --git a/json-fleece-swagger2/json-fleece-swagger2.cabal b/json-fleece-swagger2/json-fleece-swagger2.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           json-fleece-swagger2
-version:        0.4.0.3
+version:        0.4.0.4
 description:    Please see the README on GitHub at <https://github.com/githubuser/json-fleece-swagger2#readme>
 homepage:       https://github.com/flipstone/json-fleece#readme
 bug-reports:    https://github.com/flipstone/json-fleece/issues
@@ -125,7 +125,7 @@ test-suite json-fleece-swagger2-test
       aeson >=2.0 && <2.2
     , base >=4.7 && <5
     , bytestring ==0.11.*
-    , file-embed ==0.0.15.*
+    , file-embed >=0.0.15 && <0.0.17
     , hedgehog
     , json-fleece-codegen-util >=0.6 && <0.10
     , json-fleece-swagger2

diff --git a/json-fleece-swagger2/package.yaml b/json-fleece-swagger2/package.yaml
@@ -1,5 +1,5 @@
 name:                json-fleece-swagger2
-version:             0.4.0.3
+version:             0.4.0.4
 github:              "flipstone/json-fleece/json-fleece-swagger2"
 license:             BSD3
 author:              "Author name here"
@@ -86,4 +86,4 @@ tests:
       - hedgehog
       - aeson >= 2.0 && < 2.2
       - bytestring >= 0.11 && < 0.12
-      - file-embed >= 0.0.15 && < 0.0.16
+      - file-embed >= 0.0.15 && < 0.0.17