From 9e3bb073326ff6d55941408acf1c51ab2b1185bc Mon Sep 17 00:00:00 2001 From: Timothy Miller Date: Thu, 9 Jan 2025 17:22:29 -0500 Subject: [PATCH] Updated for new aeson, updated stack resolver --- stack.yaml | 2 +- stack.yaml.lock | 8 ++++---- vault-tool/src/Data/Aeson/Utils.hs | 4 ++-- vault-tool/vault-tool.cabal | 3 +-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/stack.yaml b/stack.yaml index 0e74d29..f45d003 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-22.30 +resolver: lts-23.3 flags: {} packages: - vault-tool diff --git a/stack.yaml.lock b/stack.yaml.lock index 0aebfde..64030c7 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -6,7 +6,7 @@ packages: [] snapshots: - completed: - sha256: 795b7a893148a42f09956611a0fa1139293fe6ef934d053468d8e53e3e013390 - size: 719577 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/30.yaml - original: lts-22.30 + sha256: dd89d2322cb5af74c6ab9d96c0c5f6c8e6653e0c991d619b4bb141a49cb98668 + size: 679282 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/23/3.yaml + original: lts-23.3 diff --git a/vault-tool/src/Data/Aeson/Utils.hs b/vault-tool/src/Data/Aeson/Utils.hs index 6976eb9..6285d92 100644 --- a/vault-tool/src/Data/Aeson/Utils.hs +++ b/vault-tool/src/Data/Aeson/Utils.hs @@ -15,10 +15,10 @@ import Data.Maybe (catMaybes) object :: [Maybe Pair] -> Value object = Aeson.object . catMaybes -(.=!) :: (KeyValue a, ToJSON b) => Key -> b -> Maybe a +(.=!) :: (KeyValue e a, ToJSON b) => Key -> b -> Maybe a k .=! v = Just $ k .= v -(.=?) :: (Functor f, KeyValue a, ToJSON b) => Key -> f b -> f a +(.=?) :: (Functor f, KeyValue e a, ToJSON b) => Key -> f b -> f a k .=? v = (k .=) <$> v newtype DataWrapper a = DataWrapper {unDataWrapper :: a} diff --git a/vault-tool/vault-tool.cabal b/vault-tool/vault-tool.cabal index fcd1287..e221383 100644 --- a/vault-tool/vault-tool.cabal +++ b/vault-tool/vault-tool.cabal @@ -33,8 +33,7 @@ library http-client, http-types, http-client-tls, - -- vault-tool doesn't yet work with new KeyValue constraint from aeson-2.2 - aeson < 2.2, + aeson >=2.2, unordered-containers, time