From 07202340d82fddc32f1cad82a437a438565cc2ba Mon Sep 17 00:00:00 2001 From: "jim@bo" Date: Wed, 20 Jun 2018 03:08:45 -0400 Subject: port to newer versions of packages: * iproute >= 1.7.4 * conduit-extra >= 1.1.7 --- src/Network/Tox.hs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/Network/Tox.hs') diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs index 89a8d99f..45f8e633 100644 --- a/src/Network/Tox.hs +++ b/src/Network/Tox.hs @@ -62,7 +62,11 @@ import Data.Conduit (Source,Sink,Flush(..)) import Data.Data import Data.Functor.Contravariant import Data.Hashable +#if MIN_VERSION_iproute(1,7,4) +import Data.IP hiding (fromSockAddr) +#else import Data.IP +#endif import Data.Maybe import qualified Data.MinMaxPSQ as MinMaxPSQ ;import Data.MinMaxPSQ (MinMaxPSQ') -- cgit v1.2.3