port to newer versions of packages:

	* iproute       >= 1.7.4
	* conduit-extra >= 1.1.7

3 files changed, 15 insertions, 1 deletions

diff --git a/bittorrent/src/Network/BitTorrent/Exchange/Message.hs b/bittorrent/src/Network/BitTorrent/Exchange/Message.hs
index 2c6770f7..5c096523 100644
--- a/bittorrent/src/Network/BitTorrent/Exchange/Message.hs
+++ b/bittorrent/src/Network/BitTorrent/Exchange/Message.hs
@@ -32,6 +32,7 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE DeriveDataTypeable         #-}
 {-# LANGUAGE TemplateHaskell            #-}
+{-# LANGUAGE CPP                        #-}
 {-# OPTIONS  -fno-warn-orphans          #-}
 module Network.BitTorrent.Exchange.Message
        ( -- * Capabilities
@@ -111,7 +112,11 @@ import Data.String
 import Data.Text as T
 import Data.Typeable
 import Data.Word
+#if MIN_VERSION_iproute(1,7,4)
+import Data.IP hiding (fromSockAddr)
+#else
 import Data.IP
+#endif
 import Network
 import Network.Socket hiding (KeepAlive)
 import Text.PrettyPrint as PP hiding ((<>))
diff --git a/bittorrent/src/Network/BitTorrent/Tracker/Message.hs b/bittorrent/src/Network/BitTorrent/Tracker/Message.hs
index e01ebbf4..ab492275 100644
--- a/bittorrent/src/Network/BitTorrent/Tracker/Message.hs
+++ b/bittorrent/src/Network/BitTorrent/Tracker/Message.hs
@@ -27,6 +27,7 @@
 {-# LANGUAGE DeriveFunctor              #-}
 {-# LANGUAGE ScopedTypeVariables        #-}
 {-# LANGUAGE TypeFamilies               #-}
+{-# LANGUAGE CPP                        #-}
 {-# OPTIONS -fno-warn-orphans           #-}
 module Network.BitTorrent.Tracker.Message
        ( -- * Announce
@@ -115,7 +116,11 @@ import Data.Text (Text)
 import Data.Text.Encoding
 import Data.Typeable
 import Data.Word
+#if MIN_VERSION_iproute(1,7,4)
+import Data.IP hiding (fromSockAddr)
+#else
 import Data.IP
+#endif
 import Network
 import Network.HTTP.Types.QueryLike
 import Network.HTTP.Types.URI hiding (urlEncode)
diff --git a/bittorrent/tests/Network/BitTorrent/CoreSpec.hs b/bittorrent/tests/Network/BitTorrent/CoreSpec.hs
index 5bf900b2..e9b17a42 100644
--- a/bittorrent/tests/Network/BitTorrent/CoreSpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/CoreSpec.hs
@@ -4,7 +4,11 @@ module Network.BitTorrent.CoreSpec (spec) where
 import Control.Applicative
 import Data.BEncode as BE
 import Data.ByteString.Lazy as BL
+#if MIN_VERSION_iproute(1,7,4)
+import Data.IP hiding (fromSockAddr)
+#else
 import Data.IP
+#endif
 import Data.Serialize as S
 import Data.String
 import Data.Text.Encoding as T
@@ -302,4 +306,4 @@ spec = do
       fingerprint "-ML2.7.2-xxxxxxxxxxx" `shouldBe` "MLdonkey-0"
 
 -- TODO XBT, Bits on Wheels, Queen Bee, BitTyrant, TorrenTopia,
--- BitSpirit, Rufus, G3 Torrent, FlashGet
\ No newline at end of file
+-- BitSpirit, Rufus, G3 Torrent, FlashGet