summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoe <joe@jerkface.net>2014-01-28 00:46:34 -0500
committerjoe <joe@jerkface.net>2014-01-28 00:46:34 -0500
commit9f033e2337bc7dbbaf27dcffbdb8d333ef28eb8d (patch)
treecd9b8d58ed3d99a1da191caba6b2d739e8a78c2b
parent571d786e4a953bbf5d5bb7c4f9aacf8d03052b3a (diff)
allowed older version of 'network' dependency
-rw-r--r--Hosts.hs8
-rw-r--r--kiki.cabal2
2 files changed, 9 insertions, 1 deletions
diff --git a/Hosts.hs b/Hosts.hs
index e53d441..0761597 100644
--- a/Hosts.hs
+++ b/Hosts.hs
@@ -1,5 +1,9 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE ScopedTypeVariables #-} 2{-# LANGUAGE ScopedTypeVariables #-}
2{-# LANGUAGE OverloadedStrings #-} 3{-# LANGUAGE OverloadedStrings #-}
4#if ! MIN_VERSION_network(2,4,0)
5{-# LANGUAGE StandaloneDeriving #-}
6#endif
3module Hosts 7module Hosts
4 ( Hosts 8 ( Hosts
5 , assignName 9 , assignName
@@ -31,6 +35,10 @@ import Control.Applicative ( (<$>), (<*>) )
31import Control.Monad (mplus) 35import Control.Monad (mplus)
32import Network.Socket 36import Network.Socket
33 37
38#if ! MIN_VERSION_network(2,4,0)
39deriving instance Ord SockAddr
40#endif
41
34handleIO_ h a = Exception.catch a (\(_ :: IOException) -> h) 42handleIO_ h a = Exception.catch a (\(_ :: IOException) -> h)
35 43
36inet_pton :: String -> Maybe SockAddr 44inet_pton :: String -> Maybe SockAddr
diff --git a/kiki.cabal b/kiki.cabal
index 7edf6cd..a5ede74 100644
--- a/kiki.cabal
+++ b/kiki.cabal
@@ -19,7 +19,7 @@ Executable kiki
19 crypto-pubkey-types -any, 19 crypto-pubkey-types -any,
20 asn1-types -any, asn1-encoding -any, 20 asn1-types -any, asn1-encoding -any,
21 dataenc -any, text -any, pretty -any, pretty-show -any, 21 dataenc -any, text -any, pretty -any, pretty-show -any,
22 bytestring -any, openpgp (==0.6.1), binary -any, 22 bytestring -any, openpgp (>=0.6.1), binary -any,
23 unix, time, 23 unix, time,
24 containers -any, process -any, filepath -any, 24 containers -any, process -any, filepath -any,
25 network 25 network