Skip to content

Commit 82f233c

Browse files
committed
Switch from connection -> crypton-connection and build with GHC 9.6.3
1 parent 56bed08 commit 82f233c

File tree

5 files changed

+43
-28
lines changed

5 files changed

+43
-28
lines changed

kubernetes-client/kubernetes-client.cabal

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 1.12
22

3-
-- This file has been generated from package.yaml by hpack version 0.35.2.
3+
-- This file has been generated from package.yaml by hpack version 0.36.0.
44
--
55
-- see: https://github.com/sol/hpack
66

@@ -52,8 +52,12 @@ library
5252
, base >=4.7 && <5.0
5353
, base64-bytestring
5454
, bytestring >=0.10
55-
, connection >=0.3
5655
, containers >=0.5
56+
, crypton-connection
57+
, crypton-x509 >=1.7
58+
, crypton-x509-store >=1.6
59+
, crypton-x509-system >=1.6
60+
, crypton-x509-validation >=1.6
5761
, data-default-class >=0.1
5862
, either >=5.0
5963
, filepath >=1.4
@@ -77,10 +81,6 @@ library
7781
, tls >=1.4.1
7882
, typed-process >=0.2
7983
, uri-bytestring >=0.3
80-
, x509 >=1.7
81-
, x509-store >=1.6
82-
, x509-system >=1.6
83-
, x509-validation >=1.6
8484
, yaml >=0.8.32
8585
default-language: Haskell2010
8686

@@ -99,8 +99,12 @@ test-suite example
9999
, base >=4.7 && <5.0
100100
, base64-bytestring
101101
, bytestring >=0.10
102-
, connection >=0.3
103102
, containers >=0.5
103+
, crypton-connection
104+
, crypton-x509 >=1.7
105+
, crypton-x509-store >=1.6
106+
, crypton-x509-system >=1.6
107+
, crypton-x509-validation >=1.6
104108
, data-default-class >=0.1
105109
, either >=5.0
106110
, filepath >=1.4
@@ -125,10 +129,6 @@ test-suite example
125129
, tls >=1.4.1
126130
, typed-process >=0.2
127131
, uri-bytestring >=0.3
128-
, x509 >=1.7
129-
, x509-store >=1.6
130-
, x509-system >=1.6
131-
, x509-validation >=1.6
132132
, yaml >=0.8.32
133133
default-language: Haskell2010
134134

@@ -152,8 +152,12 @@ test-suite spec
152152
, base >=4.7 && <5.0
153153
, base64-bytestring
154154
, bytestring >=0.10
155-
, connection >=0.3
156155
, containers >=0.5
156+
, crypton-connection
157+
, crypton-x509 >=1.7
158+
, crypton-x509-store >=1.6
159+
, crypton-x509-system >=1.6
160+
, crypton-x509-validation >=1.6
157161
, data-default-class >=0.1
158162
, either >=5.0
159163
, file-embed
@@ -182,9 +186,5 @@ test-suite spec
182186
, tls >=1.4.1
183187
, typed-process >=0.2
184188
, uri-bytestring >=0.3
185-
, x509 >=1.7
186-
, x509-store >=1.6
187-
, x509-system >=1.6
188-
, x509-validation >=1.6
189189
, yaml
190190
default-language: Haskell2010

kubernetes-client/package.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ dependencies:
4343
- aeson >=1.2 && <3
4444
- attoparsec >=0.13
4545
- jsonpath >=0.1 && <0.4
46-
- connection >=0.3
4746
- containers >= 0.5
47+
- crypton-connection
4848
- data-default-class >=0.1
4949
- either >=5.0
5050
- filepath >=1.4
@@ -67,8 +67,8 @@ dependencies:
6767
- tls >=1.4.1
6868
- typed-process >=0.2
6969
- uri-bytestring >=0.3
70-
- x509 >=1.7
71-
- x509-system >=1.6
72-
- x509-store >=1.6
73-
- x509-validation >=1.6
70+
- crypton-x509 >=1.7
71+
- crypton-x509-system >=1.6
72+
- crypton-x509-store >=1.6
73+
- crypton-x509-validation >=1.6
7474
- yaml >=0.8.32

kubernetes-client/src/Kubernetes/Client/Auth/OIDC.hs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ instance AuthMethod OIDCAuth where
6161
& L.set rAuthTypesL []
6262

6363
data OIDCGetTokenException =
64-
#if MIN_VERSION_hoauth2(2,8,0)
64+
#if MIN_VERSION_hoauth2(2,9,0)
65+
OIDCOAuthException TokenResponseError
66+
#elif MIN_VERSION_hoauth2(2,8,0)
6567
OIDCOAuthException TokenRequestError
6668
#else
6769
OIDCOAuthException (OAuth2Error OAuth2TokenRequest.Errors)

stack.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
resolver: lts-21.0
1+
resolver: lts-22.6
22

33
packages:
44
- kubernetes
55
- kubernetes-client
6+
7+
extra-deps:
8+
- oidc-client-0.7.0.1@sha256:557341f7521e62c09abddf0d06c8e8acce119d3a9a4c4ffac1ab8ca3fc0e5067,3382
9+
10+
# - git: https://github.com/codedownio/haskell-oidc-client
11+
# commit: 3cb40ba3abfc9a030f31cc2f919bfc192f7e9f5e

stack.yaml.lock

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,17 @@
33
# For more information, please see the documentation at:
44
# https://docs.haskellstack.org/en/stable/lock_files
55

6-
packages: []
6+
packages:
7+
- completed:
8+
hackage: oidc-client-0.7.0.1@sha256:557341f7521e62c09abddf0d06c8e8acce119d3a9a4c4ffac1ab8ca3fc0e5067,3382
9+
pantry-tree:
10+
sha256: 51cfcd6c170923db24ba297ac9937961f6b26e041ceec8ff09500e61017b433b
11+
size: 1298
12+
original:
13+
hackage: oidc-client-0.7.0.1@sha256:557341f7521e62c09abddf0d06c8e8acce119d3a9a4c4ffac1ab8ca3fc0e5067,3382
714
snapshots:
815
- completed:
9-
sha256: 1867d84255dff8c87373f5dd03e5a5cb1c10a99587e26c8793e750c54e83ffdc
10-
size: 639139
11-
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/0.yaml
12-
original: lts-21.0
16+
sha256: 1b4c2669e26fa828451830ed4725e4d406acc25a1fa24fcc039465dd13d7a575
17+
size: 714100
18+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/6.yaml
19+
original: lts-22.6

0 commit comments

Comments
 (0)