Merge pull request #6651 from commercialhaskell/re5994

Re #5994 - Bump dependency on tls to tls-2.1.0

CONTRIBUTING.md

@@ -348,9 +348,10 @@ compatibility with a range of versions of GHC that a library package (such as
 Stack aims to depend on well-known packages. The specific versions on which it
 depends at any time are specified by `package.yaml` and `stack.yaml`. It does
 not aim to be compatible with more than one version of the `Cabal` package at
-any time. At the time of writing (July 2024) the package versions are primarily
-ones in Stackage snapshot LTS Haskell 22.28 (for GHC 9.6.6), together with
-extra-deps to depend on the latest version of `hpack`, `pantry` and `tar`.
+any time. At the time of writing (september 2024) the package versions are
+primarily ones in Stackage snapshot LTS Haskell 22.28 (for GHC 9.6.6), together
+with extra-deps to depend on the latest version of `hpack`, `pantry`, `tar`,
+`tls` and `crypton-connection`.
 
 A Stack executable makes use of Cabal (the library) through a small 'Setup'
 executable that it compiles from Haskell source code. The executable compiles

stack-ghc-9.10.1.yaml

@@ -4,7 +4,7 @@
 # Currently, Stack cannot be built with GHC 9.10.1 because Cabal-3.12.0.0 has
 # changed the type of Distribution.PackageDescription.Check.checkPackage.
 
-snapshot: nightly-2024-08-02 # GHC 9.8.2
+snapshot: nightly-2024-09-26 # GHC 9.8.2
 compiler: ghc-9.10.1
 
 extra-deps:
@@ -18,6 +18,8 @@ extra-deps:
 - http-api-data-0.6.1
 - process-1.6.19.0@rev:1
 - time-1.12.2
+# nightly-2024-09-26 provides tls-2.0.6
+- tls-2.1.0@sha256:39f9a6183a6dafc3365e99f4f3b99a55154f8a3a3114d9475459a066f56a3a32,6173
 - unix-2.8.5.1
 - uuid-types-1.0.6
 

stack-ghc-9.10.1.yaml.lock

@@ -74,6 +74,13 @@ packages:
       size: 7264
   original:
     hackage: time-1.12.2
+- completed:
+    hackage: tls-2.1.0@sha256:39f9a6183a6dafc3365e99f4f3b99a55154f8a3a3114d9475459a066f56a3a32,6173
+    pantry-tree:
+      sha256: eaa57b1302d6e68d064f126094360df6ecb7cf5e1c79837bf832595eb800590a
+      size: 6452
+  original:
+    hackage: tls-2.1.0@sha256:39f9a6183a6dafc3365e99f4f3b99a55154f8a3a3114d9475459a066f56a3a32,6173
 - completed:
     hackage: unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808
     pantry-tree:
@@ -90,7 +97,7 @@ packages:
     hackage: uuid-types-1.0.6
 snapshots:
 - completed:
-    sha256: 2b63732cfb5782292320fdba3920b71a2144d1265018f0312cb35b0ce04e78f5
-    size: 656849
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/8/2.yaml
-  original: nightly-2024-08-02
+    sha256: 9efe9f561e73b88351653af623aa1aaa4a51b6fbe62fa549a0d24b040de11300
+    size: 664617
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/9/26.yaml
+  original: nightly-2024-09-26

stack-ghc-9.8.2.yaml

@@ -1,7 +1,11 @@
 # This is an experimental project-level configuration, to see if Stack can be
 # built with GHC 9.8.2.
 
-snapshot: nightly-2024-07-28 # GHC 9.8.2
+snapshot: nightly-2024-09-26 # GHC 9.8.2
+
+extra-deps:
+# nightly-2024-09-26 provides tls-2.0.6
+- tls-2.1.0@sha256:39f9a6183a6dafc3365e99f4f3b99a55154f8a3a3114d9475459a066f56a3a32,6173
 
 docker:
   enable: false

stack-ghc-9.8.2.yaml.lock

@@ -1,12 +1,19 @@
 # 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: []
+packages:
+- completed:
+    hackage: tls-2.1.0@sha256:39f9a6183a6dafc3365e99f4f3b99a55154f8a3a3114d9475459a066f56a3a32,6173
+    pantry-tree:
+      sha256: eaa57b1302d6e68d064f126094360df6ecb7cf5e1c79837bf832595eb800590a
+      size: 6452
+  original:
+    hackage: tls-2.1.0@sha256:39f9a6183a6dafc3365e99f4f3b99a55154f8a3a3114d9475459a066f56a3a32,6173
 snapshots:
 - completed:
-    sha256: c6e4cd173fb499ea2865dd89ef283f85e7c306972b5039a4f96c6371e37c2118
-    size: 656842
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/7/28.yaml
-  original: nightly-2024-07-28
+    sha256: 9efe9f561e73b88351653af623aa1aaa4a51b6fbe62fa549a0d24b040de11300
+    size: 664617
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/9/26.yaml
+  original: nightly-2024-09-26

stack.yaml

@@ -7,6 +7,10 @@ extra-deps:
 - tar-0.6.2.0@sha256:619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba,4576
 # lts-22.28 provides hpack-0.36.0
 - hpack-0.37.0@sha256:b7c91b0416a55c134172a9fd9a02f3815ba68c4b92cca4e320c36906d5e970e0,5187
+# lts-22.28 provides tls-1.8.0
+- tls-2.1.0@sha256:39f9a6183a6dafc3365e99f4f3b99a55154f8a3a3114d9475459a066f56a3a32,6173
+# lts-22.28 provides crypton-connection-0.3.2
+- crypton-connection-0.4.1@sha256:a03dabfac16fcc58b4089c2f75ad1e97fc71c4a44f3aeb790db65cebb9ebd1d0,1590
 
 docker:
   enable: false

stack.yaml.lock

@@ -1,7 +1,7 @@
 # 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:
 - completed:
@@ -25,6 +25,20 @@ packages:
       size: 3742
   original:
     hackage: hpack-0.37.0@sha256:b7c91b0416a55c134172a9fd9a02f3815ba68c4b92cca4e320c36906d5e970e0,5187
+- completed:
+    hackage: tls-2.1.0@sha256:39f9a6183a6dafc3365e99f4f3b99a55154f8a3a3114d9475459a066f56a3a32,6173
+    pantry-tree:
+      sha256: eaa57b1302d6e68d064f126094360df6ecb7cf5e1c79837bf832595eb800590a
+      size: 6452
+  original:
+    hackage: tls-2.1.0@sha256:39f9a6183a6dafc3365e99f4f3b99a55154f8a3a3114d9475459a066f56a3a32,6173
+- completed:
+    hackage: crypton-connection-0.4.1@sha256:a03dabfac16fcc58b4089c2f75ad1e97fc71c4a44f3aeb790db65cebb9ebd1d0,1590
+    pantry-tree:
+      sha256: 821d6ea277735b78fe6df218f158188aed4081317d3ef614a50aac44bb7a4061
+      size: 394
+  original:
+    hackage: crypton-connection-0.4.1@sha256:a03dabfac16fcc58b4089c2f75ad1e97fc71c4a44f3aeb790db65cebb9ebd1d0,1590
 snapshots:
 - completed:
     sha256: 87da71cb0ae9ee1ea1bf51a8eb9812f39f779be76abc0a3c926defd8afda05d1