Skip to content

Commit 25251e6

Browse files
committed
kubernetes-api-client: fix compatibility with test-2.1.2
1 parent c9adc30 commit 25251e6

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import Data.Either.Combinators
1515
import Data.Function ((&))
1616
import Data.Map (Map)
1717
import Data.Maybe
18-
import Data.Text
18+
import Data.Text (Text)
1919
import Data.Text.Encoding (encodeUtf8)
2020
import Data.Time.Clock.POSIX (getPOSIXTime)
2121
import Jose.Jwt

kubernetes-api-client/src/Kubernetes/Data/K8sJSONPath.hs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
{-# LANGUAGE CPP #-}
22
{-# LANGUAGE OverloadedStrings #-}
3+
34
module Kubernetes.Data.K8sJSONPath where
45

5-
import Control.Applicative ((<|>))
6+
import Control.Applicative ((<|>))
67
import Data.Aeson
78
import Data.Aeson.Text
89
import Data.Bifunctor
910
import Data.JSONPath
10-
import Data.Text as Text
11-
import Data.Text.Lazy (toStrict)
11+
import Data.Text (Text)
12+
import qualified Data.Text as Text
13+
import Data.Text.Lazy (toStrict)
1214

1315
#if !MIN_VERSION_base(4,11,0)
1416
import Data.Monoid ((<>))
@@ -72,7 +74,7 @@ runPathElement (JSONPath p) v = encodeResult $ executeJSONPath p v
7274

7375
#if MIN_VERSION_jsonpath(0,3,0)
7476
encodeResult :: [Value] -> Either String Text
75-
encodeResult vals = return $ (intercalate " " $ Prelude.map jsonToText vals)
77+
encodeResult vals = return $ (Text.intercalate " " $ Prelude.map jsonToText vals)
7678
#else
7779
encodeResult :: ExecutionResult Value -> Either String Text
7880
encodeResult (ResultValue val) = return $ jsonToText val

stack.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
resolver: lts-23.7
1+
resolver: nightly-2025-03-26
2+
compiler: ghc-9.12.1
23

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

stack.yaml.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file was autogenerated by Stack.
22
# You should not edit this file by hand.
33
# For more information, please see the documentation at:
4-
# https://docs.haskellstack.org/en/stable/lock_files
4+
# https://docs.haskellstack.org/en/stable/topics/lock_files
55

66
packages:
77
- completed:
@@ -17,7 +17,7 @@ packages:
1717
git: https://github.com/codedownio/haskell-oidc-client
1818
snapshots:
1919
- completed:
20-
sha256: 4ef79c30b9efcf07335cb3de532983a7ac4c5a4180bc17f6212a86b09ce2ff75
21-
size: 680777
22-
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/23/7.yaml
23-
original: lts-23.7
20+
sha256: 4c29c0db842701a33a94ab7567579e4e6e46169b904ab912887651025a314e8e
21+
size: 668540
22+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2025/3/26.yaml
23+
original: nightly-2025-03-26

0 commit comments

Comments
 (0)