Updates to build against newer libraries:

 * prettyclass instead of deprecated pretty-class
 * use pPrint instead of pretty
 * backported to iproute-1.2.11 (convenient for debian jessie)

1 files changed, 13 insertions, 7 deletions

diff --git a/src/Network/BitTorrent/Exchange/Session.hs b/src/Network/BitTorrent/Exchange/Session.hs
index 2bd275bd..ca849c23 100644
--- a/src/Network/BitTorrent/Exchange/Session.hs
+++ b/src/Network/BitTorrent/Exchange/Session.hs
@@ -1,7 +1,9 @@
-{-# LANGUAGE FlexibleInstances    #-}
-{-# LANGUAGE TypeFamilies         #-}
-{-# LANGUAGE TemplateHaskell      #-}
-{-# LANGUAGE DeriveDataTypeable   #-}
+{-# LANGUAGE CPP                #-}
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE TemplateHaskell    #-}
+{-# LANGUAGE TypeFamilies       #-}
 module Network.BitTorrent.Exchange.Session
        ( -- * Session
          Session
@@ -43,7 +45,7 @@ import Data.Set  as S
 import Data.Text as T
 import Data.Typeable
 import Text.PrettyPrint hiding ((<>))
-import Text.PrettyPrint.Class
+import Text.PrettyPrint.HughesPJClass hiding ((<>),($$))
 import System.Log.FastLogger (LogStr, ToLogStr (..))
 
 import Data.BEncode as BE
@@ -57,6 +59,10 @@ import Network.BitTorrent.Exchange.Download as D
 import Network.BitTorrent.Exchange.Message as Message
 import System.Torrent.Storage
 
+#if !MIN_VERSION_iproute(1,2,12)
+deriving instance Ord IP
+#endif
+
 {-----------------------------------------------------------------------
 --  Exceptions
 -----------------------------------------------------------------------}
@@ -222,11 +228,11 @@ instance MonadLogger (Connected Session) where
     conn <- ask
     ses  <- asks connSession
     addr <- asks connRemoteAddr
-    let addrSrc = src <> " @ " <> T.pack (render (pretty addr))
+    let addrSrc = src <> " @ " <> T.pack (render (pPrint addr))
     liftIO $ sessionLogger ses loc addrSrc lvl (toLogStr msg)
 
 logMessage :: MonadLogger m => Message -> m ()
-logMessage msg = logDebugN $ T.pack (render (pretty msg))
+logMessage msg = logDebugN $ T.pack (render (pPrint msg))
 
 logEvent   :: MonadLogger m => Text    -> m ()
 logEvent       = logInfoN