From 18eb751288df992f37367134f5d9f63eafd37b45 Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Mon, 8 Jul 2013 09:04:36 +0000 Subject: [PATCH 2/2] Remove a redundant instance declaration. * tordnsel.cabal (Build-Depends): Change the required version of 'network'. * src/TorDNSEL/Util.hsc (instance Ord SockAddr): Remove it. --- src/TorDNSEL/Util.hsc | 9 --------- tordnsel.cabal | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/TorDNSEL/Util.hsc b/src/TorDNSEL/Util.hsc index 5d38468..0ba7365 100644 --- a/src/TorDNSEL/Util.hsc +++ b/src/TorDNSEL/Util.hsc @@ -440,15 +440,6 @@ bindListeningUnixDomainStreamSocket sockPath mode = do listen sock sOMAXCONN return sock -instance Ord SockAddr where - SockAddrInet port1 addr1 `compare` SockAddrInet port2 addr2 = - case addr1 `compare` addr2 of - EQ -> port1 `compare` port2 - other -> other - SockAddrUnix path1 `compare` SockAddrUnix path2 = path1 `compare` path2 - SockAddrInet _ _ `compare` SockAddrUnix _ = LT - SockAddrUnix _ `compare` SockAddrInet _ _ = GT - -------------------------------------------------------------------------------- -- Monads diff --git a/tordnsel.cabal b/tordnsel.cabal index 09a273e..6268544 100644 --- a/tordnsel.cabal +++ b/tordnsel.cabal @@ -22,7 +22,7 @@ Flag Devel Default: False Executable tordnsel - Build-Depends: base>=2.0, network>=2.0, mtl>=1.0, unix>=1.0, stm>=2.0, + Build-Depends: base>=2.0, network>=2.4.0.0, mtl>=1.0, unix>=1.0, stm>=2.0, time>=1.0, binary>=0.4, bytestring>=0.9, array>=0.1, directory>=1.0, containers>=0.1 Main-Is: tordnsel.hs -- 1.7.9.5