Skip to content

Commit 7d9af0d

Browse files
committed
Bump aeson to ^>= 2.2.0.0, use attoparsec-aeson
1 parent eabf54a commit 7d9af0d

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

hackage-server.cabal

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ common defaults
129129
, scientific
130130
-- other dependencies shared by most components
131131
build-depends:
132-
, aeson ^>= 2.0.3.0 || ^>= 2.1.0.0
132+
, aeson ^>= 2.2.0.0
133133
, Cabal >= 3.10.1.0 && < 3.12
134134
, Cabal-syntax >= 3.10.1.0 && < 3.12
135135
-- Cabal-syntax needs to be bound to constrain hackage-security
@@ -547,6 +547,7 @@ test-suite HighLevelTest
547547
build-depends:
548548
-- version constraints inherited from lib-server
549549
, HTTP
550+
, attoparsec-aeson ^>= 2.2.0.0
550551
, base64-bytestring
551552
, random
552553
-- component-specific dependencies

tests/HttpUtils.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ import Control.Monad
2727
import Data.Maybe
2828
import Network.HTTP hiding (user)
2929
import Network.HTTP.Auth
30-
import Data.Aeson (Result(..), Value(..), FromJSON(..), (.:), fromJSON, json')
30+
import Data.Aeson (Result(..), Value(..), FromJSON(..), (.:), fromJSON)
31+
import Data.Aeson.Parser (json')
3132
import System.Exit (die)
3233

3334
import qualified Network.Http.Client as HC

0 commit comments

Comments
 (0)