Merge pull request #123 from haskellari/bump-lower-bounds

Bump lower bounds of non-bundled deps
haskellari · Jul 31, 2023 · dcfec6f · dcfec6f
2 parents ed4b1c5 + a74dec4
commit dcfec6f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/postgresql-simple.cabal b/postgresql-simple.cabal
@@ -79,21 +79,21 @@ library
     , bytestring        >=0.10.8.2 && <0.12
     , containers        >=0.6.0.1  && <0.7
     , template-haskell  >=2.14.0.0 && <2.21
-    , text              >=1.2.3.0  && <1.3 || >=2.0 && <2.1
+    , text              >=1.2.3.0  && <1.3  || >=2.0 && <2.1
     , time-compat       >=1.9.5    && <1.12
     , transformers      >=0.5.6.2  && <0.7
 
   -- Other dependencies
   build-depends:
-      aeson               >=1.4.1.0    && <1.6 || >=2.0.0.0 && <2.3
-    , attoparsec          >=0.13.2.2   && <0.15
-    , case-insensitive    >=1.2.0.11   && <1.3
-    , hashable            >=1.2.7.0    && <1.5
-    , Only                >=0.1        && <0.1.1
-    , postgresql-libpq    >=0.10.0.0   && <0.11
-    , scientific          >=0.3.6.2    && <0.4
-    , uuid-types          >=1.0.3      && <1.1
-    , vector              >=0.12.0.1   && <0.14
+      aeson             >=2.1.2.1  && <2.3
+    , attoparsec        >=0.14.4   && <0.15
+    , case-insensitive  >=1.2.1.0  && <1.3
+    , hashable          >=1.4.3.0  && <1.5
+    , Only              >=0.1      && <0.1.1
+    , postgresql-libpq  >=0.10.0.0 && <0.11
+    , scientific        >=0.3.7.0  && <0.4
+    , uuid-types        >=1.0.5    && <1.1
+    , vector            >=0.13.0.0 && <0.14
 
   default-extensions:
     BangPatterns
@@ -128,10 +128,10 @@ test-suite test
   main-is:            Main.hs
   other-modules:
     Common
+    Interval
     Notify
     Serializable
     Time
-    Interval
 
   ghc-options:        -threaded
   ghc-options:        -Wall -fno-warn-name-shadowing -fno-warn-unused-do-bind

diff --git a/src/Database/PostgreSQL/Simple/FromField.hs b/src/Database/PostgreSQL/Simple/FromField.hs
@@ -154,11 +154,7 @@ import qualified Data.UUID.Types as UUID
 import           Data.Scientific (Scientific)
 import           GHC.Real (infinity, notANumber)
 
-#if MIN_VERSION_aeson(2,1,2)
 import qualified Data.Aeson.Types as JSON
-#else
-import qualified Data.Aeson.Internal as JSON
-#endif
 
 -- | Exception thrown if conversion from a SQL value to a Haskell
 -- value fails.