From fc3925a1cdadf57d2efbb8fb89e6ec8ec7cfc91b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Mar 2017 15:38:15 -0400 Subject: [PATCH] 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 --- CHANGELOG | 1 + git-annex.cabal | 11 ++--------- stack.yaml | 1 - 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 580faff6f8..c697d08690 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,6 +13,7 @@ git-annex (6.20170301.2) UNRELEASED; urgency=medium in the warning message. * Windows: Improve handling of shebang in external special remote program, searching for the program in the PATH. + * Drop support for building without network-uri. -- Joey Hess Thu, 02 Mar 2017 12:51:40 -0400 diff --git a/git-annex.cabal b/git-annex.cabal index b9e3fecbe7..c79ca70341 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) diff --git a/stack.yaml b/stack.yaml index 78cdc87ac3..0a86233b5f 100644 --- a/stack.yaml +++ b/stack.yaml @@ -4,7 +4,6 @@ flags: production: true assistant: true pairing: true - network-uri: true s3: true testsuite: true webdav: true