diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-02-23 20:35:32 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-02-23 20:35:32 -0400 |
| commit | ec5e6d7dec82f06be9600a012c5aaf01a30f6af7 (patch) | |
| tree | 8df5c2f43faa81cff5126529f7c4c5b95e36a6bd | |
| parent | 3aab18a4c171b6f812bfe89877401421d293a515 (diff) | |
remove support for network older than 2.4
debian stable has 2.4
| -rw-r--r-- | Git/Types.hs | 1 | ||||
| -rw-r--r-- | Utility/URI.hs | 18 | ||||
| -rw-r--r-- | git-annex.cabal | 2 |
3 files changed, 1 insertions, 20 deletions
diff --git a/Git/Types.hs b/Git/Types.hs index bb91a1703..1eef2f743 100644 --- a/Git/Types.hs +++ b/Git/Types.hs @@ -11,7 +11,6 @@ import Network.URI import qualified Data.Map as M import System.Posix.Types import Utility.SafeCommand -import Utility.URI () {- Support repositories on local disk, and repositories accessed via an URL. - diff --git a/Utility/URI.hs b/Utility/URI.hs deleted file mode 100644 index e68fda58d..000000000 --- a/Utility/URI.hs +++ /dev/null @@ -1,18 +0,0 @@ -{- Network.URI - - - - Copyright 2014 Joey Hess <id@joeyh.name> - - - - License: BSD-2-clause - -} - -{-# LANGUAGE CPP #-} - -module Utility.URI where - --- Old versions of network lacked an Ord for URI -#if ! MIN_VERSION_network(2,4,0) -import Network.URI - -instance Ord URI where - a `compare` b = show a `compare` show b -#endif diff --git a/git-annex.cabal b/git-annex.cabal index 85cba3c97..7f7518f4b 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -130,7 +130,7 @@ Executable git-annex if flag(network-uri) Build-Depends: network-uri (>= 2.6), network (>= 2.6) else - Build-Depends: network (< 2.6), network (>= 2.0) + Build-Depends: network (< 2.6), network (>= 2.4) if flag(Cryptonite) Build-Depends: cryptonite |