[sc-39654] Update to lts-22.39

flipstone · Oct 31, 2024 · b5f4d3b · b5f4d3b
1 parent 7614bdc
commit b5f4d3b
Show file tree

Hide file tree

Showing 9 changed files with 101 additions and 157 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.6.5-2024-05-15-5314c42
+    image: ghcr.io/flipstone/haskell-tools:debian-stable-ghc-9.6.6-2024-10-31-833d7d1
     volumes:
       - .:${PROJECT_DIR}
       - flipstone_stack_root:/stack-root

diff --git a/json-fleece-openapi3/examples/star-trek/stack.yaml b/json-fleece-openapi3/examples/star-trek/stack.yaml
@@ -1,5 +1,4 @@
-resolver:
-  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/22.yaml
+resolver: lts-22.39
 system-ghc: true
 install-ghc: false
 
@@ -27,14 +26,13 @@ extra-deps:
   - ../../../json-fleece-core
   - ../../../json-fleece-aeson
   - ../../../json-fleece-aeson-beeline
-  - git: https://github.com/flipstone/beeline
-    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
+  - github: flipstone/beeline
+    commit: 47d1fe37ef10368cb1ed9ddcd7781f58c80a96b8
     subdirs:
       - beeline-routing
       - beeline-http-client
-  - git: https://github.com/flipstone/shrubbery
-    commit: 73bea50a23ec60106eae9aa75a06ee854beb2e71
-  - non-empty-text-0.2.0@sha256:7d1c1f9a11c78c00c656269f940d2fcccd3c2eaf6b619f66bb83a9ea72decc1f,2438
+  - github: flipstone/shrubbery
+    commit: 95c5bf28d03ed8b4df163a98b878fa515bf40604
 
 # Override default flag values for local packages and extra-deps
 # flags: {}

diff --git a/json-fleece-openapi3/examples/star-trek/stack.yaml.lock b/json-fleece-openapi3/examples/star-trek/stack.yaml.lock
@@ -5,53 +5,45 @@
 
 packages:
 - completed:
-    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
-    git: https://github.com/flipstone/beeline
     name: beeline-routing
     pantry-tree:
       sha256: f79fc2e97dfa9147e44cbc6dedb2f9c024e1c2856a0b5a07facfdaa7cd0fd6c6
       size: 1174
+    sha256: 6f8428e62267150a960c41f59e1000b70c28c40d22b01a241c0d120775af5e43
+    size: 24689
     subdir: beeline-routing
+    url: https://github.com/flipstone/beeline/archive/47d1fe37ef10368cb1ed9ddcd7781f58c80a96b8.tar.gz
     version: 0.2.4.0
   original:
-    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
-    git: https://github.com/flipstone/beeline
     subdir: beeline-routing
+    url: https://github.com/flipstone/beeline/archive/47d1fe37ef10368cb1ed9ddcd7781f58c80a96b8.tar.gz
 - completed:
-    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
-    git: https://github.com/flipstone/beeline
     name: beeline-http-client
     pantry-tree:
-      sha256: 003653d3a0cfe9ead5e3e98ef277d32e9ac2000b4079069820b1d6cb597b9790
+      sha256: afb20a23917633dfdc5486359cc65217df3eab2089ecd428a11d1f021a4715eb
       size: 718
+    sha256: 6f8428e62267150a960c41f59e1000b70c28c40d22b01a241c0d120775af5e43
+    size: 24689
     subdir: beeline-http-client
+    url: https://github.com/flipstone/beeline/archive/47d1fe37ef10368cb1ed9ddcd7781f58c80a96b8.tar.gz
     version: 0.8.0.0
   original:
-    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
-    git: https://github.com/flipstone/beeline
     subdir: beeline-http-client
+    url: https://github.com/flipstone/beeline/archive/47d1fe37ef10368cb1ed9ddcd7781f58c80a96b8.tar.gz
 - completed:
-    commit: 73bea50a23ec60106eae9aa75a06ee854beb2e71
-    git: https://github.com/flipstone/shrubbery
     name: shrubbery
     pantry-tree:
-      sha256: e18a9032ca90d613943b023bdc2b362e42cfb1761c31886f83270e40a54d5095
-      size: 1737
-    version: 0.2.1.0
+      sha256: 39ce7cb2d835d5b80e8085a1ba776d09c29df63c2d20b1fc74ac4bf034174241
+      size: 1739
+    sha256: d7efa64a63aba7f7e77fedb81c461a0a50344ba7a45a44ad447a2dd721cc70ac
+    size: 25629
+    url: https://github.com/flipstone/shrubbery/archive/95c5bf28d03ed8b4df163a98b878fa515bf40604.tar.gz
+    version: 0.2.2.0
   original:
-    commit: 73bea50a23ec60106eae9aa75a06ee854beb2e71
-    git: https://github.com/flipstone/shrubbery
-- completed:
-    hackage: non-empty-text-0.2.0@sha256:7d1c1f9a11c78c00c656269f940d2fcccd3c2eaf6b619f66bb83a9ea72decc1f,2438
-    pantry-tree:
-      sha256: 303f637d7ca4c4573c8d861282b07b172959c8d3f3aa531b0462f3d08b9669d1
-      size: 400
-  original:
-    hackage: non-empty-text-0.2.0@sha256:7d1c1f9a11c78c00c656269f940d2fcccd3c2eaf6b619f66bb83a9ea72decc1f,2438
+    url: https://github.com/flipstone/shrubbery/archive/95c5bf28d03ed8b4df163a98b878fa515bf40604.tar.gz
 snapshots:
 - completed:
-    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/22/22.yaml
+    sha256: 6c5aeace2ca5ecde793a9e0acfaa730ec8f384aa2f6183a2a252f5f9ec55d623
+    size: 720039
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/39.yaml
+  original: lts-22.39
diff --git a/json-fleece-openapi3/examples/test-cases/stack.yaml b/json-fleece-openapi3/examples/test-cases/stack.yaml
@@ -1,5 +1,4 @@
-resolver:
-  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/22.yaml
+resolver: lts-22.39
 system-ghc: true
 install-ghc: false
 
@@ -27,14 +26,13 @@ extra-deps:
   - ../../../json-fleece-core
   - ../../../json-fleece-aeson
   - ../../../json-fleece-aeson-beeline
-  - git: https://github.com/flipstone/beeline
-    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
+  - github: flipstone/beeline
+    commit: 47d1fe37ef10368cb1ed9ddcd7781f58c80a96b8
     subdirs:
       - beeline-routing
       - beeline-http-client
-  - git: https://github.com/flipstone/shrubbery
-    commit: 73bea50a23ec60106eae9aa75a06ee854beb2e71
-  - non-empty-text-0.2.0@sha256:7d1c1f9a11c78c00c656269f940d2fcccd3c2eaf6b619f66bb83a9ea72decc1f,2438
+  - github: flipstone/shrubbery
+    commit: 95c5bf28d03ed8b4df163a98b878fa515bf40604
 
 # Override default flag values for local packages and extra-deps
 # flags: {}

diff --git a/json-fleece-openapi3/examples/test-cases/stack.yaml.lock b/json-fleece-openapi3/examples/test-cases/stack.yaml.lock
@@ -5,53 +5,45 @@
 
 packages:
 - completed:
-    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
-    git: https://github.com/flipstone/beeline
     name: beeline-routing
     pantry-tree:
       sha256: f79fc2e97dfa9147e44cbc6dedb2f9c024e1c2856a0b5a07facfdaa7cd0fd6c6
       size: 1174
+    sha256: 6f8428e62267150a960c41f59e1000b70c28c40d22b01a241c0d120775af5e43
+    size: 24689
     subdir: beeline-routing
+    url: https://github.com/flipstone/beeline/archive/47d1fe37ef10368cb1ed9ddcd7781f58c80a96b8.tar.gz
     version: 0.2.4.0
   original:
-    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
-    git: https://github.com/flipstone/beeline
     subdir: beeline-routing
+    url: https://github.com/flipstone/beeline/archive/47d1fe37ef10368cb1ed9ddcd7781f58c80a96b8.tar.gz
 - completed:
-    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
-    git: https://github.com/flipstone/beeline
     name: beeline-http-client
     pantry-tree:
-      sha256: 003653d3a0cfe9ead5e3e98ef277d32e9ac2000b4079069820b1d6cb597b9790
+      sha256: afb20a23917633dfdc5486359cc65217df3eab2089ecd428a11d1f021a4715eb
       size: 718
+    sha256: 6f8428e62267150a960c41f59e1000b70c28c40d22b01a241c0d120775af5e43
+    size: 24689
     subdir: beeline-http-client
+    url: https://github.com/flipstone/beeline/archive/47d1fe37ef10368cb1ed9ddcd7781f58c80a96b8.tar.gz
     version: 0.8.0.0
   original:
-    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
-    git: https://github.com/flipstone/beeline
     subdir: beeline-http-client
+    url: https://github.com/flipstone/beeline/archive/47d1fe37ef10368cb1ed9ddcd7781f58c80a96b8.tar.gz
 - completed:
-    commit: 73bea50a23ec60106eae9aa75a06ee854beb2e71
-    git: https://github.com/flipstone/shrubbery
     name: shrubbery
     pantry-tree:
-      sha256: e18a9032ca90d613943b023bdc2b362e42cfb1761c31886f83270e40a54d5095
-      size: 1737
-    version: 0.2.1.0
+      sha256: 39ce7cb2d835d5b80e8085a1ba776d09c29df63c2d20b1fc74ac4bf034174241
+      size: 1739
+    sha256: d7efa64a63aba7f7e77fedb81c461a0a50344ba7a45a44ad447a2dd721cc70ac
+    size: 25629
+    url: https://github.com/flipstone/shrubbery/archive/95c5bf28d03ed8b4df163a98b878fa515bf40604.tar.gz
+    version: 0.2.2.0
   original:
-    commit: 73bea50a23ec60106eae9aa75a06ee854beb2e71
-    git: https://github.com/flipstone/shrubbery
-- completed:
-    hackage: non-empty-text-0.2.0@sha256:7d1c1f9a11c78c00c656269f940d2fcccd3c2eaf6b619f66bb83a9ea72decc1f,2438
-    pantry-tree:
-      sha256: 303f637d7ca4c4573c8d861282b07b172959c8d3f3aa531b0462f3d08b9669d1
-      size: 400
-  original:
-    hackage: non-empty-text-0.2.0@sha256:7d1c1f9a11c78c00c656269f940d2fcccd3c2eaf6b619f66bb83a9ea72decc1f,2438
+    url: https://github.com/flipstone/shrubbery/archive/95c5bf28d03ed8b4df163a98b878fa515bf40604.tar.gz
 snapshots:
 - completed:
-    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/22/22.yaml
+    sha256: 6c5aeace2ca5ecde793a9e0acfaa730ec8f384aa2f6183a2a252f5f9ec55d623
+    size: 720039
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/39.yaml
+  original: lts-22.39
diff --git a/json-fleece-swagger2/examples/uber/stack.yaml b/json-fleece-swagger2/examples/uber/stack.yaml
@@ -1,5 +1,4 @@
-resolver:
-  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/22.yaml
+resolver: lts-22.39
 system-ghc: true
 install-ghc: false
 
@@ -27,14 +26,13 @@ extra-deps:
   - ../../../json-fleece-core
   - ../../../json-fleece-aeson
   - ../../../json-fleece-aeson-beeline
-  - git: https://github.com/flipstone/beeline
-    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
+  - github: flipstone/beeline
+    commit: 47d1fe37ef10368cb1ed9ddcd7781f58c80a96b8
     subdirs:
       - beeline-routing
       - beeline-http-client
-  - git: https://github.com/flipstone/shrubbery
-    commit: 73bea50a23ec60106eae9aa75a06ee854beb2e71
-  - non-empty-text-0.2.0@sha256:7d1c1f9a11c78c00c656269f940d2fcccd3c2eaf6b619f66bb83a9ea72decc1f,2438
+  - github: flipstone/shrubbery
+    commit: 95c5bf28d03ed8b4df163a98b878fa515bf40604
 
 # Override default flag values for local packages and extra-deps
 # flags: {}

diff --git a/json-fleece-swagger2/examples/uber/stack.yaml.lock b/json-fleece-swagger2/examples/uber/stack.yaml.lock
@@ -5,53 +5,45 @@
 
 packages:
 - completed:
-    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
-    git: https://github.com/flipstone/beeline
     name: beeline-routing
     pantry-tree:
       sha256: f79fc2e97dfa9147e44cbc6dedb2f9c024e1c2856a0b5a07facfdaa7cd0fd6c6
       size: 1174
+    sha256: 6f8428e62267150a960c41f59e1000b70c28c40d22b01a241c0d120775af5e43
+    size: 24689
     subdir: beeline-routing
+    url: https://github.com/flipstone/beeline/archive/47d1fe37ef10368cb1ed9ddcd7781f58c80a96b8.tar.gz
     version: 0.2.4.0
   original:
-    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
-    git: https://github.com/flipstone/beeline
     subdir: beeline-routing
+    url: https://github.com/flipstone/beeline/archive/47d1fe37ef10368cb1ed9ddcd7781f58c80a96b8.tar.gz
 - completed:
-    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
-    git: https://github.com/flipstone/beeline
     name: beeline-http-client
     pantry-tree:
-      sha256: 003653d3a0cfe9ead5e3e98ef277d32e9ac2000b4079069820b1d6cb597b9790
+      sha256: afb20a23917633dfdc5486359cc65217df3eab2089ecd428a11d1f021a4715eb
       size: 718
+    sha256: 6f8428e62267150a960c41f59e1000b70c28c40d22b01a241c0d120775af5e43
+    size: 24689
     subdir: beeline-http-client
+    url: https://github.com/flipstone/beeline/archive/47d1fe37ef10368cb1ed9ddcd7781f58c80a96b8.tar.gz
     version: 0.8.0.0
   original:
-    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
-    git: https://github.com/flipstone/beeline
     subdir: beeline-http-client
+    url: https://github.com/flipstone/beeline/archive/47d1fe37ef10368cb1ed9ddcd7781f58c80a96b8.tar.gz
 - completed:
-    commit: 73bea50a23ec60106eae9aa75a06ee854beb2e71
-    git: https://github.com/flipstone/shrubbery
     name: shrubbery
     pantry-tree:
-      sha256: e18a9032ca90d613943b023bdc2b362e42cfb1761c31886f83270e40a54d5095
-      size: 1737
-    version: 0.2.1.0
+      sha256: 39ce7cb2d835d5b80e8085a1ba776d09c29df63c2d20b1fc74ac4bf034174241
+      size: 1739
+    sha256: d7efa64a63aba7f7e77fedb81c461a0a50344ba7a45a44ad447a2dd721cc70ac
+    size: 25629
+    url: https://github.com/flipstone/shrubbery/archive/95c5bf28d03ed8b4df163a98b878fa515bf40604.tar.gz
+    version: 0.2.2.0
   original:
-    commit: 73bea50a23ec60106eae9aa75a06ee854beb2e71
-    git: https://github.com/flipstone/shrubbery
-- completed:
-    hackage: non-empty-text-0.2.0@sha256:7d1c1f9a11c78c00c656269f940d2fcccd3c2eaf6b619f66bb83a9ea72decc1f,2438
-    pantry-tree:
-      sha256: 303f637d7ca4c4573c8d861282b07b172959c8d3f3aa531b0462f3d08b9669d1
-      size: 400
-  original:
-    hackage: non-empty-text-0.2.0@sha256:7d1c1f9a11c78c00c656269f940d2fcccd3c2eaf6b619f66bb83a9ea72decc1f,2438
+    url: https://github.com/flipstone/shrubbery/archive/95c5bf28d03ed8b4df163a98b878fa515bf40604.tar.gz
 snapshots:
 - completed:
-    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/22/22.yaml
+    sha256: 6c5aeace2ca5ecde793a9e0acfaa730ec8f384aa2f6183a2a252f5f9ec55d623
+    size: 720039
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/39.yaml
+  original: lts-22.39
diff --git a/stack.yaml b/stack.yaml
@@ -1,5 +1,4 @@
-resolver:
-  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/22.yaml
+resolver: lts-22.39
 system-ghc: true
 install-ghc: false
 
@@ -61,17 +60,14 @@ flags:
     strict: true
 
 extra-deps:
-  - git: https://github.com/flipstone/beeline
-    commit: 343c3e5fabc812e5c32efa33ddf8a6cee965e8b0
+  - github: flipstone/beeline
+    commit: 47d1fe37ef10368cb1ed9ddcd7781f58c80a96b8
     subdirs:
       - beeline-routing
       - beeline-http-client
-  - git: https://github.com/flipstone/shrubbery
-    commit: 73bea50a23ec60106eae9aa75a06ee854beb2e71
-  - non-empty-text-0.2.1
+  - github: flipstone/shrubbery
+    commit: 95c5bf28d03ed8b4df163a98b878fa515bf40604
   - hermes-json-0.6.1.0@sha256:ab54609e63a83a8e07900360de60ba1e197ea499fa5d3eb782eed980ee07545b,3856
-  - integer-conversion-0.1.0.1
-  - text-iso8601-0.1@sha256:fc10d8de72fc094d0d299644f17421b9430d1c1092a1355c7f0c02d8b6edf6a7,2371
 
 
 # Extra package databases containing global packages