summaryrefslogtreecommitdiff
path: root/src/Network/Tox.hs
diff options
context:
space:
mode:
authorjim@bo <jim@bo>2018-06-20 03:08:45 -0400
committerjim@bo <jim@bo>2018-06-20 18:00:29 -0400
commit07202340d82fddc32f1cad82a437a438565cc2ba (patch)
treea836218263b4cb45ab3cc39ddeee5d24619ab976 /src/Network/Tox.hs
parente1c7ba154a1010cf33ff4daa045d8f4542e2267c (diff)
port to newer versions of packages:
* iproute >= 1.7.4 * conduit-extra >= 1.1.7
Diffstat (limited to 'src/Network/Tox.hs')
-rw-r--r--src/Network/Tox.hs4
1 files changed, 4 insertions, 0 deletions
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(..))
62import Data.Data 62import Data.Data
63import Data.Functor.Contravariant 63import Data.Functor.Contravariant
64import Data.Hashable 64import Data.Hashable
65#if MIN_VERSION_iproute(1,7,4)
66import Data.IP hiding (fromSockAddr)
67#else
65import Data.IP 68import Data.IP
69#endif
66import Data.Maybe 70import Data.Maybe
67import qualified Data.MinMaxPSQ as MinMaxPSQ 71import qualified Data.MinMaxPSQ as MinMaxPSQ
68 ;import Data.MinMaxPSQ (MinMaxPSQ') 72 ;import Data.MinMaxPSQ (MinMaxPSQ')