From 3c9e3992e3528056c09f8cee1c4bdce6d7b107de Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Sun, 8 Jun 2025 06:01:04 -0700 Subject: [PATCH 1/4] Try to not use connection, even for older GHCs --- .github/workflows/ci.yml | 12 ++-- .../kubernetes-api-client.cabal | 57 +++++-------------- kubernetes-api-client/package.yaml | 21 ++----- stack-9.10.2.yaml | 18 ++++++ stack-9.10.2.yaml.lock | 23 ++++++++ stack.yaml | 4 +- stack.yaml.lock | 8 +-- 7 files changed, 74 insertions(+), 69 deletions(-) create mode 100644 stack-9.10.2.yaml create mode 100644 stack-9.10.2.yaml.lock diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c2b930f1..ee8d8f30 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: ghc: # - "8.10.7" # - "9.0.2" - # - "9.2.8" + - "9.2.8" - "9.4.8" - "9.6.6" - "9.8.4" @@ -88,14 +88,16 @@ jobs: # 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.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.8.4" - yaml: "stack.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 diff --git a/kubernetes-api-client/kubernetes-api-client.cabal b/kubernetes-api-client/kubernetes-api-client.cabal index d04d12d6..71e686ab 100644 --- a/kubernetes-api-client/kubernetes-api-client.cabal +++ b/kubernetes-api-client/kubernetes-api-client.cabal @@ -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 diff --git a/kubernetes-api-client/package.yaml b/kubernetes-api-client/package.yaml index c60745cc..e8988db9 100644 --- a/kubernetes-api-client/package.yaml +++ b/kubernetes-api-client/package.yaml @@ -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 diff --git a/stack-9.10.2.yaml b/stack-9.10.2.yaml new file mode 100644 index 00000000..e0e21a23 --- /dev/null +++ b/stack-9.10.2.yaml @@ -0,0 +1,18 @@ +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/codedownio/haskell-oidc-client + # codedown-jun-2024-ghc98 + commit: b70757b85751525cba41316ea9af132d9a43cfaf + +nix: + pure: false + packages: + - zlib diff --git a/stack-9.10.2.yaml.lock b/stack-9.10.2.yaml.lock new file mode 100644 index 00000000..d2685332 --- /dev/null +++ b/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: b70757b85751525cba41316ea9af132d9a43cfaf + git: https://github.com/codedownio/haskell-oidc-client + name: oidc-client + pantry-tree: + sha256: b389011ec2b8e7422a56c82833075ddf0152f613044f7acdd1f51a1346d2f7ca + size: 1901 + version: 0.8.0.0 + original: + commit: b70757b85751525cba41316ea9af132d9a43cfaf + git: https://github.com/codedownio/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 diff --git a/stack.yaml b/stack.yaml index 783f5c09..543f06fe 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,5 +1,5 @@ -resolver: nightly-2025-03-26 -compiler: ghc-9.12.1 +resolver: nightly-2025-05-28 +compiler: ghc-9.12.2 # This repo contains multiple versions of kubernetes-api, in the # kubernetes-api-* directories. diff --git a/stack.yaml.lock b/stack.yaml.lock index 53f14218..d2685332 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -17,7 +17,7 @@ packages: git: https://github.com/codedownio/haskell-oidc-client snapshots: - completed: - sha256: 4c29c0db842701a33a94ab7567579e4e6e46169b904ab912887651025a314e8e - size: 668540 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2025/3/26.yaml - original: nightly-2025-03-26 + sha256: e9b93acfb8aaf8ae4869050506553a963a8adba95748cd60356f9ffe64f03345 + size: 712232 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2025/5/28.yaml + original: nightly-2025-05-28 From 1f8959dc43d4b417c4bd83defb0c70006aed17cc Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Mon, 9 Jun 2025 14:54:40 -0700 Subject: [PATCH 2/4] Only test stack for GHC >= 9.6 --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee8d8f30..be9ebd70 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,16 +88,16 @@ jobs: # 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.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.10.2" yaml: "stack-9.10.2.yaml" - # - ghc: "9.12.2" - # yaml: "stack.yaml" + - ghc: "9.12.2" + yaml: "stack.yaml" steps: - uses: cachix/install-nix-action@v27 From 40a7f4361de2fd8f23630de1955c615421c38d66 Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Mon, 9 Jun 2025 15:45:55 -0700 Subject: [PATCH 3/4] Drop older stack files, update remainder. Prepare kubernetes-api-client-0.6.1.0 --- .github/workflows/ci.yml | 12 +----- kubernetes-api-client/CHANGELOG.md | 6 +++ .../kubernetes-api-client.cabal | 2 +- kubernetes-api-client/package.yaml | 2 +- stack-8.10.7.yaml | 8 ---- stack-8.10.7.yaml.lock | 19 --------- stack-9.0.2-aeson1.yaml | 12 ------ stack-9.0.2-aeson1.yaml.lock | 40 ------------------- stack-9.0.2-aeson2.yaml | 10 ----- stack-9.0.2-aeson2.yaml.lock | 26 ------------ stack-9.10.2.yaml | 5 +-- stack-9.10.2.yaml.lock | 12 +++--- stack-9.2.8.yaml | 8 ---- stack-9.2.8.yaml.lock | 19 --------- stack-9.4.8.yaml | 17 -------- stack-9.4.8.yaml.lock | 23 ----------- stack-9.6.6.yaml | 17 -------- stack-9.6.7.yaml | 14 +++++++ stack-9.6.7.yaml.lock | 23 +++++++++++ stack-9.8.4.yaml | 14 +++++++ stack-9.8.4.yaml.lock | 23 +++++++++++ 21 files changed, 92 insertions(+), 220 deletions(-) delete mode 100644 stack-8.10.7.yaml delete mode 100644 stack-8.10.7.yaml.lock delete mode 100644 stack-9.0.2-aeson1.yaml delete mode 100644 stack-9.0.2-aeson1.yaml.lock delete mode 100644 stack-9.0.2-aeson2.yaml delete mode 100644 stack-9.0.2-aeson2.yaml.lock delete mode 100644 stack-9.2.8.yaml delete mode 100644 stack-9.2.8.yaml.lock delete mode 100644 stack-9.4.8.yaml delete mode 100644 stack-9.4.8.yaml.lock delete mode 100644 stack-9.6.6.yaml create mode 100644 stack-9.6.7.yaml create mode 100644 stack-9.6.7.yaml.lock create mode 100644 stack-9.8.4.yaml create mode 100644 stack-9.8.4.yaml.lock diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be9ebd70..739d8b92 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,18 +82,10 @@ 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.8.4" + yaml: "stack-9.8.4.yaml" - ghc: "9.10.2" yaml: "stack-9.10.2.yaml" - ghc: "9.12.2" diff --git a/kubernetes-api-client/CHANGELOG.md b/kubernetes-api-client/CHANGELOG.md index a7f9adfe..71922aa9 100644 --- a/kubernetes-api-client/CHANGELOG.md +++ b/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`. diff --git a/kubernetes-api-client/kubernetes-api-client.cabal b/kubernetes-api-client/kubernetes-api-client.cabal index 71e686ab..df30568f 100644 --- a/kubernetes-api-client/kubernetes-api-client.cabal +++ b/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. . diff --git a/kubernetes-api-client/package.yaml b/kubernetes-api-client/package.yaml index e8988db9..700ffd56 100644 --- a/kubernetes-api-client/package.yaml +++ b/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. diff --git a/stack-8.10.7.yaml b/stack-8.10.7.yaml deleted file mode 100644 index 36e6ddc5..00000000 --- a/stack-8.10.7.yaml +++ /dev/null @@ -1,8 +0,0 @@ -resolver: lts-18.28 - -packages: -- kubernetes-api-1.20 -- kubernetes-api-client - -extra-deps: -- oidc-client-0.4.0.0 diff --git a/stack-8.10.7.yaml.lock b/stack-8.10.7.yaml.lock deleted file mode 100644 index 706b73ff..00000000 --- a/stack-8.10.7.yaml.lock +++ /dev/null @@ -1,19 +0,0 @@ -# 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 - -packages: -- completed: - hackage: oidc-client-0.4.0.0@sha256:f72a496ab27d9a5071be44e750718c539118ac52c2f1535a5fb3dde7f9874a55,3306 - pantry-tree: - sha256: 68c285c6365360975d50bbb18cb07755d5ef19af8bf0e998d3ea46d35ef4a4e1 - size: 1153 - original: - hackage: oidc-client-0.4.0.0 -snapshots: -- completed: - sha256: 428ec8d5ce932190d3cbe266b9eb3c175cd81e984babf876b64019e2cbe4ea68 - size: 590100 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/28.yaml - original: lts-18.28 diff --git a/stack-9.0.2-aeson1.yaml b/stack-9.0.2-aeson1.yaml deleted file mode 100644 index c6b281d9..00000000 --- a/stack-9.0.2-aeson1.yaml +++ /dev/null @@ -1,12 +0,0 @@ - -resolver: nightly-2022-02-07 - -packages: -- kubernetes-api-1.20 -- kubernetes-api-client - -extra-deps: -- jsonpath-0.2.0.0 -- jwt-0.10.0 -- oidc-client-0.4.0.0 -- hoauth2-1.16.0 diff --git a/stack-9.0.2-aeson1.yaml.lock b/stack-9.0.2-aeson1.yaml.lock deleted file mode 100644 index 71afd695..00000000 --- a/stack-9.0.2-aeson1.yaml.lock +++ /dev/null @@ -1,40 +0,0 @@ -# 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 - -packages: -- completed: - hackage: jsonpath-0.2.0.0@sha256:de8eba99a0a970ea1c82b934ccc338f3b5d3fe8273f9196f368ca7bfcf680434,2195 - pantry-tree: - size: 1098 - sha256: dd8c7029fab3895f60fef8e1fd537c9ebde4a90006cc0f0582ffd9b87955ad9e - original: - hackage: jsonpath-0.2.0.0 -- completed: - hackage: jwt-0.10.0@sha256:2cb02121a9aab3b2d8d927cca78e0ebd6e43661a73cc65024162e9d1096ca5d1,4186 - pantry-tree: - size: 1027 - sha256: b7c92f54dcba5085f7a3660d41bc3236cd3b3fc2b8c762bda8af88ae1e47f29c - original: - hackage: jwt-0.10.0 -- completed: - hackage: oidc-client-0.4.0.0@sha256:f72a496ab27d9a5071be44e750718c539118ac52c2f1535a5fb3dde7f9874a55,3306 - pantry-tree: - size: 1153 - sha256: 68c285c6365360975d50bbb18cb07755d5ef19af8bf0e998d3ea46d35ef4a4e1 - original: - hackage: oidc-client-0.4.0.0 -- completed: - hackage: hoauth2-1.16.0@sha256:161b20369ce80cd8348e448e3b307e7850c3d21e8ae4f1e258dbd04d0da34a65,5629 - pantry-tree: - size: 2046 - sha256: 55931b378faa4a89275c572ecf9a5ec65a7a71f092819e4f704a285a7d4f6f35 - original: - hackage: hoauth2-1.16.0 -snapshots: -- completed: - size: 634925 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2022/2/7.yaml - sha256: eccf3b87cf7521eb8e7704c2efbb579d2074a0a76c7b961e0f07b98b3079ada5 - original: nightly-2022-02-07 diff --git a/stack-9.0.2-aeson2.yaml b/stack-9.0.2-aeson2.yaml deleted file mode 100644 index 756048f7..00000000 --- a/stack-9.0.2-aeson2.yaml +++ /dev/null @@ -1,10 +0,0 @@ - -resolver: lts-19.33 - -packages: -- kubernetes-api-1.20 -- kubernetes-api-client - -extra-deps: -- oidc-client-0.6.0.0 -- jose-jwt-0.9.5 diff --git a/stack-9.0.2-aeson2.yaml.lock b/stack-9.0.2-aeson2.yaml.lock deleted file mode 100644 index 830cd226..00000000 --- a/stack-9.0.2-aeson2.yaml.lock +++ /dev/null @@ -1,26 +0,0 @@ -# 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 - -packages: -- completed: - hackage: oidc-client-0.6.0.0@sha256:2079dc5c9dfb5b3e2fa93098254ca16787c01a0cd3634b1d84afe84c9a6c4825,3368 - pantry-tree: - sha256: c8dac64944a1e60d14958067e1992732effe723d60353690720c34b4d126af48 - size: 1298 - original: - hackage: oidc-client-0.6.0.0 -- completed: - hackage: jose-jwt-0.9.5@sha256:c02db1ef32e582330054d8befa412215afeeb597cb8756dadc75407ba776a159,3557 - pantry-tree: - sha256: 778e69fddd33a43f9a2322d4404a27c3f7474295bbdad6f65325fe9c9fee3d86 - size: 1231 - original: - hackage: jose-jwt-0.9.5 -snapshots: -- completed: - sha256: 6d1532d40621957a25bad5195bfca7938e8a06d923c91bc52aa0f3c41181f2d4 - size: 619204 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/33.yaml - original: lts-19.33 diff --git a/stack-9.10.2.yaml b/stack-9.10.2.yaml index e0e21a23..55d4c371 100644 --- a/stack-9.10.2.yaml +++ b/stack-9.10.2.yaml @@ -8,9 +8,8 @@ packages: - kubernetes-api-client extra-deps: -- git: https://github.com/codedownio/haskell-oidc-client - # codedown-jun-2024-ghc98 - commit: b70757b85751525cba41316ea9af132d9a43cfaf +- git: https://github.com/krdlab/haskell-oidc-client + commit: 2d19db09bf13f02f49248f7b21703b2c59e06ecc nix: pure: false diff --git a/stack-9.10.2.yaml.lock b/stack-9.10.2.yaml.lock index d2685332..583ee5c5 100644 --- a/stack-9.10.2.yaml.lock +++ b/stack-9.10.2.yaml.lock @@ -5,16 +5,16 @@ packages: - completed: - commit: b70757b85751525cba41316ea9af132d9a43cfaf - git: https://github.com/codedownio/haskell-oidc-client + commit: 2d19db09bf13f02f49248f7b21703b2c59e06ecc + git: https://github.com/krdlab/haskell-oidc-client name: oidc-client pantry-tree: - sha256: b389011ec2b8e7422a56c82833075ddf0152f613044f7acdd1f51a1346d2f7ca - size: 1901 + sha256: 1ba8f7b134dffd636721d4cebc4c52721b8cb628bc332eed3088443cd2cc969c + size: 1846 version: 0.8.0.0 original: - commit: b70757b85751525cba41316ea9af132d9a43cfaf - git: https://github.com/codedownio/haskell-oidc-client + commit: 2d19db09bf13f02f49248f7b21703b2c59e06ecc + git: https://github.com/krdlab/haskell-oidc-client snapshots: - completed: sha256: e9b93acfb8aaf8ae4869050506553a963a8adba95748cd60356f9ffe64f03345 diff --git a/stack-9.2.8.yaml b/stack-9.2.8.yaml deleted file mode 100644 index 0b75bd3a..00000000 --- a/stack-9.2.8.yaml +++ /dev/null @@ -1,8 +0,0 @@ -resolver: lts-20.26 - -packages: -- kubernetes-api-1.20 -- kubernetes-api-client - -extra-deps: -- oidc-client-0.7.0.1 diff --git a/stack-9.2.8.yaml.lock b/stack-9.2.8.yaml.lock deleted file mode 100644 index efd3968f..00000000 --- a/stack-9.2.8.yaml.lock +++ /dev/null @@ -1,19 +0,0 @@ -# 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 - -packages: -- completed: - hackage: oidc-client-0.7.0.1@sha256:557341f7521e62c09abddf0d06c8e8acce119d3a9a4c4ffac1ab8ca3fc0e5067,3382 - pantry-tree: - sha256: 51cfcd6c170923db24ba297ac9937961f6b26e041ceec8ff09500e61017b433b - size: 1298 - original: - hackage: oidc-client-0.7.0.1 -snapshots: -- completed: - sha256: 5a59b2a405b3aba3c00188453be172b85893cab8ebc352b1ef58b0eae5d248a2 - size: 650475 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml - original: lts-20.26 diff --git a/stack-9.4.8.yaml b/stack-9.4.8.yaml deleted file mode 100644 index ea9a31fd..00000000 --- a/stack-9.4.8.yaml +++ /dev/null @@ -1,17 +0,0 @@ -resolver: lts-21.25 - -packages: -- kubernetes-api-1.20 -- kubernetes-api-client - -extra-deps: -# - oidc-client-0.7.0.1@sha256:557341f7521e62c09abddf0d06c8e8acce119d3a9a4c4ffac1ab8ca3fc0e5067,3382 - -- git: https://github.com/codedownio/haskell-oidc-client - # codedown-jun-2024-ghc98 - commit: b70757b85751525cba41316ea9af132d9a43cfaf - -nix: - pure: false - packages: - - zlib diff --git a/stack-9.4.8.yaml.lock b/stack-9.4.8.yaml.lock deleted file mode 100644 index 0969c061..00000000 --- a/stack-9.4.8.yaml.lock +++ /dev/null @@ -1,23 +0,0 @@ -# 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 - -packages: -- completed: - commit: b70757b85751525cba41316ea9af132d9a43cfaf - git: https://github.com/codedownio/haskell-oidc-client - name: oidc-client - pantry-tree: - sha256: b389011ec2b8e7422a56c82833075ddf0152f613044f7acdd1f51a1346d2f7ca - size: 1901 - version: 0.8.0.0 - original: - commit: b70757b85751525cba41316ea9af132d9a43cfaf - git: https://github.com/codedownio/haskell-oidc-client -snapshots: -- completed: - sha256: a81fb3877c4f9031e1325eb3935122e608d80715dc16b586eb11ddbff8671ecd - size: 640086 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/25.yaml - original: lts-21.25 diff --git a/stack-9.6.6.yaml b/stack-9.6.6.yaml deleted file mode 100644 index 3cd84191..00000000 --- a/stack-9.6.6.yaml +++ /dev/null @@ -1,17 +0,0 @@ -resolver: lts-22.43 - -packages: -- kubernetes-api-1.20 -- kubernetes-api-client - -extra-deps: -# - oidc-client-0.7.0.1@sha256:557341f7521e62c09abddf0d06c8e8acce119d3a9a4c4ffac1ab8ca3fc0e5067,3382 - -- git: https://github.com/codedownio/haskell-oidc-client - # codedown-jan-2024-ghc96 - commit: 4c122412e80c45bd28d03ead16f1a153bd53fcf4 - -nix: - pure: false - packages: - - zlib diff --git a/stack-9.6.7.yaml b/stack-9.6.7.yaml new file mode 100644 index 00000000..4f8df272 --- /dev/null +++ b/stack-9.6.7.yaml @@ -0,0 +1,14 @@ +resolver: lts-22.44 + +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 diff --git a/stack-9.6.7.yaml.lock b/stack-9.6.7.yaml.lock new file mode 100644 index 00000000..6d705f1d --- /dev/null +++ b/stack-9.6.7.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: 238fa745b64f91184f9aa518fe04bdde6552533d169b0da5256670df83a0f1a9 + size: 721141 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/44.yaml + original: lts-22.44 diff --git a/stack-9.8.4.yaml b/stack-9.8.4.yaml new file mode 100644 index 00000000..60064bc5 --- /dev/null +++ b/stack-9.8.4.yaml @@ -0,0 +1,14 @@ +resolver: lts-23.24 + +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 diff --git a/stack-9.8.4.yaml.lock b/stack-9.8.4.yaml.lock new file mode 100644 index 00000000..84195c6f --- /dev/null +++ b/stack-9.8.4.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: 400dfb2174640dd2f9f2ba7cbf9148699f2380ab64faa46f4be298a5d6205316 + size: 684057 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/23/24.yaml + original: lts-23.24 From e39d49ce8aaf0c1b33f9ba25d03dd7251539b705 Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Mon, 9 Jun 2025 16:14:04 -0700 Subject: [PATCH 4/4] ci: GHC 9.6.6 -> 9.6.7 --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 739d8b92..f888d61e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: # - "9.0.2" - "9.2.8" - "9.4.8" - - "9.6.6" + - "9.6.7" - "9.8.4" steps: - uses: cachix/install-nix-action@v27 @@ -82,8 +82,8 @@ jobs: - "1.31" - "1.32" compiler: - - 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"