1 files changed, 16 insertions, 11 deletions

diff --git a/dht/src/Network/Tox/NodeId.hs b/dht/src/Network/Tox/NodeId.hs
index d05e3697..667e7d71 100644
--- a/dht/src/Network/Tox/NodeId.hs
+++ b/dht/src/Network/Tox/NodeId.hs
@@ -47,6 +47,7 @@ module Network.Tox.NodeId
 import Control.Applicative
 import Control.Arrow
 import Control.Monad
+import Control.Monad.Fail as MF
 #ifdef CRYPTONITE_BACKPORT
 import Crypto.Error.Types                     (CryptoFailable (..),
                                                throwCryptoError)
@@ -70,7 +71,11 @@ import Data.Char
 import Data.Data
 import Data.Hashable
 #if MIN_VERSION_iproute(1,7,4)
-import Data.IP hiding (fromSockAddr)
+import Data.IP hiding ( fromSockAddr
+#if MIN_VERSION_iproute(1,7,8)
+                      , toSockAddr
+#endif
+                      )
 #else
 import Data.IP
 #endif
@@ -258,7 +263,7 @@ getIP 0x02 = IPv4 <$> S.get
 getIP 0x0a = IPv6 <$> S.get
 getIP 0x82 = IPv4 <$> S.get -- TODO: TCP TOX_TCP_INET
 getIP 0x8a = IPv6 <$> S.get -- TODO: TCP TOX_TCP_INET6
-getIP x    = fail ("unsupported address family ("++show x++")")
+getIP x    = MF.fail ("unsupported address family ("++show x++")")
 
 instance Sized NodeInfo where
     size = VarSize $ \(NodeInfo nid ip port) ->
@@ -306,7 +311,7 @@ instance Read NodeInfo where
                       return (nid,addrstr)
     (nid,addrstr) <- ( nodeidAt RP.+++ ( (zeroID,) <$> parseAddr) )
     (ip,port) <- case RP.readP_to_S (ip_w_port i) addrstr of
-                    [] -> fail "Bad address."
+                    [] -> MF.fail "Bad address."
                     ((ip,port),_):_ -> return (ip,port)
     return $ NodeInfo nid ip port
 
@@ -406,7 +411,7 @@ getIP 0x02 = IPv4 <$> S.get
 getIP 0x0a = IPv6 <$> S.get
 getIP 0x82 = IPv4 <$> S.get -- TODO: TCP
 getIP 0x8a = IPv6 <$> S.get -- TODO: TCP
-getIP x    = fail ("unsupported address family ("++show x++")")
+getIP x    = MF.fail ("unsupported address family ("++show x++")")
 
 instance S.Serialize NodeInfo where
     get = do
@@ -445,7 +450,7 @@ instance Read NodeInfo where
                       addrstr <- parseAddr
                       nid <- case Base16.decode $ C8.pack hexhash of
                               (bs,_) | B.length bs==32 -> return (PubKey bs)
-                              _                        -> fail "Bad node id."
+                              _                        -> MF.fail "Bad node id."
                       return (nid,addrstr)
     (nid,addrstr) <- ( nodeidAt RP.+++ ( (zeroID,) <$> parseAddr) )
     let raddr = do
@@ -457,7 +462,7 @@ instance Read NodeInfo where
             return (ip, port)
 
     (ip,port) <- case RP.readP_to_S raddr addrstr of
-                    [] -> fail "Bad address."
+                    [] -> MF.fail "Bad address."
                     ((ip,port),_):_ -> return (ip,port)
     return $ NodeInfo nid ip port
 
@@ -518,15 +523,15 @@ instance Read NoSpam where
         ('0':'x':ws,rs) | (length ws == 12) -> base16decode rs (NoSpam <$> get <*> (Just <$> get)) ws
         _                                   -> []
 
-base64decode :: Monad m => t1 -> Get t -> String -> m (t, t1)
+base64decode :: MonadFail m => t1 -> Get t -> String -> m (t, t1)
 base64decode rs getter s =
-    either fail (\a -> return (a,rs))
+    either MF.fail (\a -> return (a,rs))
         $ runGet getter
            =<< Base64.decode (C8.pack $ map (nmtoken64 False) s)
 
-base16decode :: Monad m => t1 -> Get t -> String -> m (t, t1)
+base16decode :: MonadFail m => t1 -> Get t -> String -> m (t, t1)
 base16decode rs getter s =
-    either fail (\a -> return (a,rs))
+    either MF.fail (\a -> return (a,rs))
         $ runGet getter
         $ fst
         $ Base16.decode (C8.pack s)
@@ -559,7 +564,7 @@ instance Show NoSpamId where
     show (NoSpamId nspam pub) = '$' : nospam64 nspam ++ "@" ++ show (key2id pub) ++ ".tox"
 
 instance Read NoSpamId where
-    readsPrec d s = either fail id $ do
+    readsPrec d s = either MF.fail id $ do
         (jid,xs) <- Right $ break isSpace s
         nsid <- parseNoSpamId $ Text.pack jid
         return [(nsid,xs)]