Merge major into master

cabal.project

@@ -1 +1,4 @@
 packages: .
+allow-newer:
+  , *:base
+  , *:template-haskell

hasql-implicits.cabal

@@ -1,6 +1,6 @@
 cabal-version: 3.0
 name: hasql-implicits
-version: 0.1.1.3
+version: 0.2
 synopsis:
   Implicit definitions for Hasql, such as default codecs for standard types
 
@@ -44,8 +44,8 @@ library
     base >=4.12 && <5,
     bytestring >=0.10 && <1,
     containers >=0.6 && <1,
-    hasql >=1.4 && <2,
-    network-ip >=0.2 && <1,
+    hasql >=1.8 && <1.9,
+    iproute >=1.7 && <1.8,
     scientific >=0.2 && <1,
     text >=1 && <3,
     time >=1.4 && <2,

library/Hasql/Implicits/Encoders.hs

@@ -85,7 +85,7 @@ INSTANCES(DiffTime, interval)
 INSTANCES(TimeOfDay, time)
 INSTANCES(LocalTime, timestamp)
 INSTANCES((TimeOfDay, TimeZone), timetz)
-INSTANCES((NetAddr IP), inet)
+INSTANCES(IPRange, inet)
 INSTANCES(Bool, bool)
 {- ORMOLU_ENABLE -}
 

library/Hasql/Implicits/Prelude.hs

@@ -30,6 +30,7 @@ import Data.Functor as Exports hiding (unzip)
 import Data.Functor.Contravariant as Exports
 import Data.Functor.Identity as Exports
 import Data.IORef as Exports
+import Data.IP as Exports (IPRange)
 import Data.Int as Exports
 import Data.Ix as Exports
 import Data.List as Exports hiding (all, and, any, concat, concatMap, elem, find, foldl, foldl', foldl1, foldr, foldr1, isSubsequenceOf, mapAccumL, mapAccumR, maximum, maximumBy, minimum, minimumBy, notElem, or, product, sortOn, sum, uncons)
@@ -61,7 +62,6 @@ import GHC.Conc as Exports hiding (threadWaitRead, threadWaitReadSTM, threadWait
 import GHC.Exts as Exports (IsList (..), groupWith, inline, lazy, sortWith)
 import GHC.Generics as Exports (Generic, Generic1)
 import GHC.IO.Exception as Exports
-import Network.IP.Addr as Exports (IP, NetAddr)
 import Numeric as Exports
 import System.Environment as Exports
 import System.Exit as Exports