remove support for network older than 2.4
debian stable has 2.4
This commit is contained in:
parent
123f823ef7
commit
9519af25f3
3 changed files with 1 additions and 20 deletions
|
@ -11,7 +11,6 @@ import Network.URI
|
||||||
import qualified Data.Map as M
|
import qualified Data.Map as M
|
||||||
import System.Posix.Types
|
import System.Posix.Types
|
||||||
import Utility.SafeCommand
|
import Utility.SafeCommand
|
||||||
import Utility.URI ()
|
|
||||||
|
|
||||||
{- Support repositories on local disk, and repositories accessed via an URL.
|
{- Support repositories on local disk, and repositories accessed via an URL.
|
||||||
-
|
-
|
||||||
|
|
|
@ -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
|
|
|
@ -130,7 +130,7 @@ Executable git-annex
|
||||||
if flag(network-uri)
|
if flag(network-uri)
|
||||||
Build-Depends: network-uri (>= 2.6), network (>= 2.6)
|
Build-Depends: network-uri (>= 2.6), network (>= 2.6)
|
||||||
else
|
else
|
||||||
Build-Depends: network (< 2.6), network (>= 2.0)
|
Build-Depends: network (< 2.6), network (>= 2.4)
|
||||||
|
|
||||||
if flag(Cryptonite)
|
if flag(Cryptonite)
|
||||||
Build-Depends: cryptonite
|
Build-Depends: cryptonite
|
||||||
|
|
Loading…
Reference in a new issue