mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

export only the parts of aeson that are used

Browse source 
Rather than hiding things not wanted. This fixes a build warning with
aeson-2.2.3 which no longer has a json function.
This commit is contained in:
Joey Hess 2024-09-25 14:41:23 -04:00
parent d026e585be
commit 76362278e9
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Command/Info.hs
View file

@ -40,7 +40,7 @@ import Annex.NumCopies
import Git.Config (boolConfig) import Git.Config (boolConfig)
import qualified Git.LsTree as LsTree import qualified Git.LsTree as LsTree
import Utility.Percentage import Utility.Percentage
import Utility.Aeson hiding (json) import Utility.Aeson
import Types.Transfer import Types.Transfer
import Logs.Transfer import Logs.Transfer
import Types.Key import Types.Key

6
Utility/Aeson.hs
View file

@ -18,11 +18,7 @@ module Utility.Aeson (
textKey, textKey,
) where ) where
#if MIN_VERSION_aeson(2,0,0) import Data.Aeson as X (decode, eitherDecode, parseJSON, FromJSON, Object, object, Value(..), (.=), (.:), (.:?))
import Data.Aeson as X hiding (ToJSON, toJSON, encode, Key)
#else
import Data.Aeson as X hiding (ToJSON, toJSON, encode)
#endif
import Data.Aeson hiding (encode) import Data.Aeson hiding (encode)
import qualified Data.Aeson import qualified Data.Aeson
#if MIN_VERSION_aeson(2,0,0) #if MIN_VERSION_aeson(2,0,0)