Remove connection dependencies and update stack files

.github/workflows/ci.yml

@@ -31,9 +31,9 @@ jobs:
         ghc:
         # - "8.10.7"
         # - "9.0.2"
-        # - "9.2.8"
+        - "9.2.8"
         - "9.4.8"
-        - "9.6.6"
+        - "9.6.7"
         - "9.8.4"
     steps:
     - uses: cachix/install-nix-action@v27
@@ -82,19 +82,13 @@ jobs:
         - "1.31"
         - "1.32"
         compiler:
-        # - ghc: "8.10.7"
-        #   yaml: "stack-8.10.7.yaml"
-        # - ghc: "9.0.2"
-        #   yaml: "stack-9.0.2-aeson1.yaml"
-        # - ghc: "9.0.2"
-        #   yaml: "stack-9.0.2-aeson2.yaml"
-        # - ghc: "9.2.8"
-        #   yaml: "stack-9.2.8.yaml"
-        - ghc: "9.4.8"
-          yaml: "stack-9.4.8.yaml"
-        - ghc: "9.6.6"
-          yaml: "stack-9.6.6.yaml"
+        - ghc: "9.6.7"
+          yaml: "stack-9.6.7.yaml"
         - ghc: "9.8.4"
+          yaml: "stack-9.8.4.yaml"
+        - ghc: "9.10.2"
+          yaml: "stack-9.10.2.yaml"
+        - ghc: "9.12.2"
           yaml: "stack.yaml"
     steps:
     - uses: cachix/install-nix-action@v27

kubernetes-api-client/CHANGELOG.md

@@ -1,4 +1,10 @@
 
 # Unreleased
 
+## 0.6.1.0
+
+* Depend on `crypton-connection` instead of `connection` no matter what, even for older GHCs. This will break compatibility with Stackage snapshots from the pre-GHC 9.6 era, but this seems important to do since `connection` is unmaintained, and itself depends on older versions of `tls` which lack some modernization/security improvements (like dropping TLS 1.0 and 1.1 support in version 2.0.0).
+
+## 0.6.0.1
+
 * Fix compatibility with `text-2.1.2`.

kubernetes-api-client/kubernetes-api-client.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           kubernetes-api-client
-version:        0.6.0.1
+version:        0.6.1.0
 synopsis:       Client library for Kubernetes
 description:    Client library for interacting with a Kubernetes cluster.
                 .
@@ -54,6 +54,11 @@ library
     , base64-bytestring
     , bytestring >=0.10
     , containers >=0.5
+    , crypton-connection
+    , crypton-x509 >=1.7
+    , crypton-x509-store >=1.6
+    , crypton-x509-system >=1.6
+    , crypton-x509-validation >=1.6
     , data-default-class >=0.1
     , either >=5.0
     , filepath >=1.4
@@ -79,20 +84,6 @@ library
     , uri-bytestring >=0.3
     , yaml >=0.8.32
   default-language: Haskell2010
-  if impl(ghc >= 9.6)
-    build-depends:
-        crypton-connection
-      , crypton-x509 >=1.7
-      , crypton-x509-store >=1.6
-      , crypton-x509-system >=1.6
-      , crypton-x509-validation >=1.6
-  else
-    build-depends:
-        connection
-      , x509 >=1.7
-      , x509-store >=1.6
-      , x509-system >=1.6
-      , x509-validation >=1.6
 
 test-suite example
   type: exitcode-stdio-1.0
@@ -110,6 +101,11 @@ test-suite example
     , base64-bytestring
     , bytestring >=0.10
     , containers >=0.5
+    , crypton-connection
+    , crypton-x509 >=1.7
+    , crypton-x509-store >=1.6
+    , crypton-x509-system >=1.6
+    , crypton-x509-validation >=1.6
     , data-default-class >=0.1
     , either >=5.0
     , filepath >=1.4
@@ -136,20 +132,6 @@ test-suite example
     , uri-bytestring >=0.3
     , yaml >=0.8.32
   default-language: Haskell2010
-  if impl(ghc >= 9.6)
-    build-depends:
-        crypton-connection
-      , crypton-x509 >=1.7
-      , crypton-x509-store >=1.6
-      , crypton-x509-system >=1.6
-      , crypton-x509-validation >=1.6
-  else
-    build-depends:
-        connection
-      , x509 >=1.7
-      , x509-store >=1.6
-      , x509-system >=1.6
-      , x509-validation >=1.6
 
 test-suite spec
   type: exitcode-stdio-1.0
@@ -172,6 +154,11 @@ test-suite spec
     , base64-bytestring
     , bytestring >=0.10
     , containers >=0.5
+    , crypton-connection
+    , crypton-x509 >=1.7
+    , crypton-x509-store >=1.6
+    , crypton-x509-system >=1.6
+    , crypton-x509-validation >=1.6
     , data-default-class >=0.1
     , either >=5.0
     , file-embed
@@ -202,17 +189,3 @@ test-suite spec
     , uri-bytestring >=0.3
     , yaml >=0.8.4
   default-language: Haskell2010
-  if impl(ghc >= 9.6)
-    build-depends:
-        crypton-connection
-      , crypton-x509 >=1.7
-      , crypton-x509-store >=1.6
-      , crypton-x509-system >=1.6
-      , crypton-x509-validation >=1.6
-  else
-    build-depends:
-        connection
-      , x509 >=1.7
-      , x509-store >=1.6
-      , x509-system >=1.6
-      , x509-validation >=1.6

kubernetes-api-client/package.yaml

@@ -1,5 +1,5 @@
 name: kubernetes-api-client
-version: 0.6.0.1
+version: 0.6.1.0
 description: |
   Client library for interacting with a Kubernetes cluster.
 
@@ -45,6 +45,11 @@ dependencies:
   - base64-bytestring
   - bytestring >=0.10
   - containers >= 0.5
+  - crypton-connection
+  - crypton-x509 >=1.7
+  - crypton-x509-store >=1.6
+  - crypton-x509-system >=1.6
+  - crypton-x509-validation >=1.6
   - data-default-class >=0.1
   - either >=5.0
   - filepath >=1.4
@@ -69,19 +74,3 @@ dependencies:
   - typed-process >=0.2
   - uri-bytestring >=0.3
   - yaml >=0.8.32
-when:
-- condition: impl(ghc >= 9.6)
-  then:
-    dependencies:
-    - crypton-connection
-    - crypton-x509 >=1.7
-    - crypton-x509-store >=1.6
-    - crypton-x509-system >=1.6
-    - crypton-x509-validation >=1.6
-  else:
-    dependencies:
-    - connection
-    - x509 >=1.7
-    - x509-store >=1.6
-    - x509-system >=1.6
-    - x509-validation >=1.6

stack-9.10.2.yaml

@@ -0,0 +1,17 @@
+resolver: nightly-2025-05-28
+
+# This repo contains multiple versions of kubernetes-api, in the
+# kubernetes-api-* directories.
+# You should use exactly one to build against.
+packages:
+- kubernetes-api-1.30
+- kubernetes-api-client
+
+extra-deps:
+- git: https://github.com/krdlab/haskell-oidc-client
+  commit: 2d19db09bf13f02f49248f7b21703b2c59e06ecc
+
+nix:
+  pure: false
+  packages:
+  - zlib

stack-9.10.2.yaml.lock

@@ -0,0 +1,23 @@
+# 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/topics/lock_files
+
+packages:
+- completed:
+    commit: 2d19db09bf13f02f49248f7b21703b2c59e06ecc
+    git: https://github.com/krdlab/haskell-oidc-client
+    name: oidc-client
+    pantry-tree:
+      sha256: 1ba8f7b134dffd636721d4cebc4c52721b8cb628bc332eed3088443cd2cc969c
+      size: 1846
+    version: 0.8.0.0
+  original:
+    commit: 2d19db09bf13f02f49248f7b21703b2c59e06ecc
+    git: https://github.com/krdlab/haskell-oidc-client
+snapshots:
+- completed:
+    sha256: e9b93acfb8aaf8ae4869050506553a963a8adba95748cd60356f9ffe64f03345
+    size: 712232
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2025/5/28.yaml
+  original: nightly-2025-05-28