From 76362278e935ad98db8b37f1f2dadde95f89bc6d Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 25 Sep 2024 14:41:23 -0400
Subject: [PATCH] export only the parts of aeson that are used

Rather than hiding things not wanted. This fixes a build warning with
aeson-2.2.3 which no longer has a json function.
---
 Command/Info.hs  | 2 +-
 Utility/Aeson.hs | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Command/Info.hs b/Command/Info.hs
index 7bc79916cb..1471a18328 100644
--- a/Command/Info.hs
+++ b/Command/Info.hs
@@ -40,7 +40,7 @@ import Annex.NumCopies
 import Git.Config (boolConfig)
 import qualified Git.LsTree as LsTree
 import Utility.Percentage
-import Utility.Aeson hiding (json)
+import Utility.Aeson
 import Types.Transfer
 import Logs.Transfer
 import Types.Key
diff --git a/Utility/Aeson.hs b/Utility/Aeson.hs
index 0eacbf0daa..e4a186979a 100644
--- a/Utility/Aeson.hs
+++ b/Utility/Aeson.hs
@@ -18,11 +18,7 @@ module Utility.Aeson (
 	textKey,
 ) where
 
-#if MIN_VERSION_aeson(2,0,0)
-import Data.Aeson as X hiding (ToJSON, toJSON, encode, Key)
-#else
-import Data.Aeson as X hiding (ToJSON, toJSON, encode)
-#endif
+import Data.Aeson as X (decode, eitherDecode, parseJSON, FromJSON, Object, object, Value(..), (.=), (.:), (.:?))
 import Data.Aeson hiding (encode)
 import qualified Data.Aeson
 #if MIN_VERSION_aeson(2,0,0)