Skip to content

Commit cb7f8cd

Browse files
committed
kubernetes-api-client: support hoauth2 >= 2.15.0
1 parent a77d763 commit cb7f8cd

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import Kubernetes.Client.KubeConfig
2424
import Kubernetes.OpenAPI.Core
2525
import Network.HTTP.Client
2626
import Network.HTTP.Client.TLS
27-
import Network.OAuth.OAuth2 as OAuth
2827
import Network.TLS as TLS
2928
import URI.ByteString
3029
import Web.OIDC.Client.Discovery as OIDC
@@ -40,6 +39,12 @@ import qualified Data.Text as Text
4039
import qualified Data.Text.Encoding as Text
4140
import qualified Lens.Micro as L
4241

42+
#if MIN_VERSION_hoauth2(2,15,0)
43+
import Network.OAuth2 as OAuth
44+
#else
45+
import Network.OAuth.OAuth2 as OAuth
46+
#endif
47+
4348
#if !MIN_VERSION_hoauth2(2,7,0)
4449
import qualified Network.OAuth.OAuth2.TokenRequest as OAuth2TokenRequest
4550
#endif

stack.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
resolver: nightly-2025-05-28
2-
compiler: ghc-9.12.2
1+
resolver: nightly-2025-11-25
32

43
# This repo contains multiple versions of kubernetes-api, in the
54
# kubernetes-api-* directories.

stack.yaml.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ packages:
1717
git: https://github.com/krdlab/haskell-oidc-client
1818
snapshots:
1919
- completed:
20-
sha256: e9b93acfb8aaf8ae4869050506553a963a8adba95748cd60356f9ffe64f03345
21-
size: 712232
22-
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2025/5/28.yaml
23-
original: nightly-2025-05-28
20+
sha256: 32d4130e25c059dbe82764e0029a2d4956d1d9d222f9256b261af308ffd8c4f4
21+
size: 710264
22+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2025/11/25.yaml
23+
original: nightly-2025-11-25

0 commit comments

Comments
 (0)