From c04aea1b83fdd60d1cea0c21ae048575b07bfa14 Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Fri, 12 Jun 2026 12:18:45 +0000 Subject: [PATCH 1/2] Fix ambiguous show This change allows using text-2.1 --- kubernetes-client/src/Kubernetes/Client/Auth/OIDC.hs | 2 +- kubernetes-client/src/Kubernetes/Data/K8sJSONPath.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes-client/src/Kubernetes/Client/Auth/OIDC.hs b/kubernetes-client/src/Kubernetes/Client/Auth/OIDC.hs index 064fbc9d..86175562 100644 --- a/kubernetes-client/src/Kubernetes/Client/Auth/OIDC.hs +++ b/kubernetes-client/src/Kubernetes/Client/Auth/OIDC.hs @@ -15,7 +15,7 @@ import Data.Either.Combinators import Data.Function ((&)) import Data.Map (Map) import Data.Maybe -import Data.Text +import Data.Text hiding (show) import Data.Text.Encoding (encodeUtf8) import Data.Time.Clock.POSIX (getPOSIXTime) import Jose.Jwt diff --git a/kubernetes-client/src/Kubernetes/Data/K8sJSONPath.hs b/kubernetes-client/src/Kubernetes/Data/K8sJSONPath.hs index 1e4501ac..49944f0b 100644 --- a/kubernetes-client/src/Kubernetes/Data/K8sJSONPath.hs +++ b/kubernetes-client/src/Kubernetes/Data/K8sJSONPath.hs @@ -7,7 +7,7 @@ import Data.Aeson import Data.Aeson.Text import Data.Bifunctor import Data.JSONPath -import Data.Text as Text +import Data.Text as Text hiding (show) import Data.Text.Lazy (toStrict) #if !MIN_VERSION_base(4,11,0) From 89f3c0f2ca115c074e6d947ee3118c13a6005233 Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Fri, 12 Jun 2026 12:25:49 +0000 Subject: [PATCH 2/2] Update for latest hoauth2 --- kubernetes-client/src/Kubernetes/Client/Auth/OIDC.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes-client/src/Kubernetes/Client/Auth/OIDC.hs b/kubernetes-client/src/Kubernetes/Client/Auth/OIDC.hs index 86175562..f727eccd 100644 --- a/kubernetes-client/src/Kubernetes/Client/Auth/OIDC.hs +++ b/kubernetes-client/src/Kubernetes/Client/Auth/OIDC.hs @@ -25,7 +25,7 @@ import Kubernetes.Client.KubeConfig import Kubernetes.OpenAPI.Core import Network.HTTP.Client import Network.HTTP.Client.TLS -import Network.OAuth.OAuth2 as OAuth +import Network.OAuth2 as OAuth import Network.TLS as TLS import URI.ByteString import Web.OIDC.Client.Discovery as OIDC