summaryrefslogtreecommitdiff
path: root/git-annex.cabal
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-03-10 15:38:15 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-03-10 15:38:15 -0400
commitbfad6f5a7d156d5ddf0e5cf3840d8d22f82a2377 (patch)
tree46b86930980714a58038340c1609ab2d6a154c49 /git-annex.cabal
parent6b92a506b974816fe7bee3a19d902bb739c4c182 (diff)
Drop support for building without network-uri.
network-uri is available in Debian stable (backports) and testing, so no need to complicate the cabal file anymore
Diffstat (limited to 'git-annex.cabal')
-rw-r--r--git-annex.cabal11
1 files changed, 2 insertions, 9 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index b9e3fecbe..c79ca7034 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -291,10 +291,6 @@ Flag Benchmark
Description: Enable benchmarking
Default: False
-Flag network-uri
- Description: Get Network.URI from the network-uri package
- Default: True
-
Flag Dbus
Description: Enable dbus support
@@ -318,6 +314,8 @@ Executable git-annex
stm (>= 2.3),
mtl (>= 2),
uuid (>= 1.2.6),
+ network (>= 2.6),
+ network-uri (>= 2.6),
process,
data-default,
case-insensitive,
@@ -376,11 +374,6 @@ Executable git-annex
if os(Linux)
GHC-Options: -optl-Wl,--as-needed
- if flag(network-uri)
- Build-Depends: network-uri (>= 2.6), network (>= 2.6)
- else
- Build-Depends: network (< 2.6), network (>= 2.4)
-
if (os(windows))
Build-Depends: Win32, Win32-extras, unix-compat (>= 0.4.1.3), setenv,
process (>= 1.3.0.0)