diff --git a/hpack.cabal b/hpack.cabal --- a/hpack.cabal +++ b/hpack.cabal @@ -1,11 +1,11 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.35.1. +-- This file has been generated from package.yaml by hpack version 0.35.2. -- -- see: https://github.com/sol/hpack name: hpack -version: 0.35.2 +version: 0.35.3 synopsis: A modern format for Haskell packages description: See README at category: Development @@ -28,19 +28,19 @@ src ghc-options: -Wall -fno-warn-incomplete-uni-patterns build-depends: - Cabal >=3.0.0.0 && <3.9 + Cabal >=3.0.0.0 && <3.11 , Glob >=0.9.0 , aeson >=1.4.3.0 - , base >=4.9 && <5 + , base >=4.13 && <5 , bifunctors , bytestring , containers - , cryptonite + , crypton , deepseq , directory >=1.2.5.0 , filepath , http-client - , http-client-tls + , http-client-tls >=0.3.6.2 , http-types , infer-license >=0.2.0 && <0.3 , pretty @@ -83,6 +83,9 @@ Path Paths_hpack default-language: Haskell2010 + if impl(ghc >= 9.4.5) && os(windows) + build-depends: + network >=3.1.2.9 executable hpack main-is: Main.hs @@ -90,20 +93,20 @@ driver ghc-options: -Wall -fno-warn-incomplete-uni-patterns build-depends: - Cabal >=3.0.0.0 && <3.9 + Cabal >=3.0.0.0 && <3.11 , Glob >=0.9.0 , aeson >=1.4.3.0 - , base >=4.9 && <5 + , base >=4.13 && <5 , bifunctors , bytestring , containers - , cryptonite + , crypton , deepseq , directory >=1.2.5.0 , filepath , hpack , http-client - , http-client-tls + , http-client-tls >=0.3.6.2 , http-types , infer-license >=0.2.0 && <0.3 , pretty @@ -116,6 +119,9 @@ other-modules: Paths_hpack default-language: Haskell2010 + if impl(ghc >= 9.4.5) && os(windows) + build-depends: + network >=3.1.2.9 test-suite spec type: exitcode-stdio-1.0 @@ -126,22 +132,22 @@ ghc-options: -Wall -fno-warn-incomplete-uni-patterns cpp-options: -DTEST build-depends: - Cabal >=3.0.0.0 && <3.9 + Cabal >=3.0.0.0 && <3.11 , Glob >=0.9.0 , HUnit >=1.6.0.0 , QuickCheck , aeson >=1.4.3.0 - , base >=4.9 && <5 + , base >=4.13 && <5 , bifunctors , bytestring , containers - , cryptonite + , crypton , deepseq , directory >=1.2.5.0 , filepath , hspec ==2.* , http-client - , http-client-tls + , http-client-tls >=0.3.6.2 , http-types , infer-license >=0.2.0 && <0.3 , interpolate @@ -211,3 +217,6 @@ Path Paths_hpack default-language: Haskell2010 + if impl(ghc >= 9.4.5) && os(windows) + build-depends: + network >=3.1.2.9 diff --git a/resources/test/hpack.cabal b/resources/test/hpack.cabal --- a/resources/test/hpack.cabal +++ b/resources/test/hpack.cabal @@ -1,11 +1,11 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.35.1. +-- This file has been generated from package.yaml by hpack version 0.35.2. -- -- see: https://github.com/sol/hpack name: hpack -version: 0.35.2 +version: 0.35.3 synopsis: A modern format for Haskell packages description: See README at category: Development @@ -28,19 +28,19 @@ src ghc-options: -Wall -fno-warn-incomplete-uni-patterns build-depends: - Cabal >=3.0.0.0 && <3.9 + Cabal >=3.0.0.0 && <3.11 , Glob >=0.9.0 , aeson >=1.4.3.0 - , base >=4.9 && <5 + , base >=4.13 && <5 , bifunctors , bytestring , containers - , cryptonite + , crypton , deepseq , directory >=1.2.5.0 , filepath , http-client - , http-client-tls + , http-client-tls >=0.3.6.2 , http-types , infer-license >=0.2.0 && <0.3 , pretty @@ -83,6 +83,9 @@ Path Paths_hpack default-language: Haskell2010 + if impl(ghc >= 9.4.5) && os(windows) + build-depends: + network >=3.1.2.9 executable hpack main-is: Main.hs @@ -90,20 +93,20 @@ driver ghc-options: -Wall -fno-warn-incomplete-uni-patterns build-depends: - Cabal >=3.0.0.0 && <3.9 + Cabal >=3.0.0.0 && <3.11 , Glob >=0.9.0 , aeson >=1.4.3.0 - , base >=4.9 && <5 + , base >=4.13 && <5 , bifunctors , bytestring , containers - , cryptonite + , crypton , deepseq , directory >=1.2.5.0 , filepath , hpack , http-client - , http-client-tls + , http-client-tls >=0.3.6.2 , http-types , infer-license >=0.2.0 && <0.3 , pretty @@ -116,6 +119,9 @@ other-modules: Paths_hpack default-language: Haskell2010 + if impl(ghc >= 9.4.5) && os(windows) + build-depends: + network >=3.1.2.9 test-suite spec type: exitcode-stdio-1.0 @@ -126,22 +132,22 @@ ghc-options: -Wall -fno-warn-incomplete-uni-patterns cpp-options: -DTEST build-depends: - Cabal >=3.0.0.0 && <3.9 + Cabal >=3.0.0.0 && <3.11 , Glob >=0.9.0 , HUnit >=1.6.0.0 , QuickCheck , aeson >=1.4.3.0 - , base >=4.9 && <5 + , base >=4.13 && <5 , bifunctors , bytestring , containers - , cryptonite + , crypton , deepseq , directory >=1.2.5.0 , filepath , hspec ==2.* , http-client - , http-client-tls + , http-client-tls >=0.3.6.2 , http-types , infer-license >=0.2.0 && <0.3 , interpolate @@ -211,3 +217,6 @@ Path Paths_hpack default-language: Haskell2010 + if impl(ghc >= 9.4.5) && os(windows) + build-depends: + network >=3.1.2.9 diff --git a/src/Data/Aeson/Config/Parser.hs b/src/Data/Aeson/Config/Parser.hs --- a/src/Data/Aeson/Config/Parser.hs +++ b/src/Data/Aeson/Config/Parser.hs @@ -47,7 +47,11 @@ import qualified Data.Aeson.Config.KeyMap as KeyMap import Data.Aeson.Types (Value(..), Object, Array) import qualified Data.Aeson.Types as Aeson +#if MIN_VERSION_aeson(2,1,0) +import Data.Aeson.Types (IResult(..), iparse) +#else import Data.Aeson.Internal (IResult(..), iparse) +#endif #if !MIN_VERSION_aeson(1,4,5) import qualified Data.Aeson.Internal as Aeson #endif