mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop support for building without network-uri.

Browse source 
network-uri is available in Debian stable (backports) and testing,
so no need to complicate the cabal file anymore
This commit is contained in:
Joey Hess 2017-03-10 15:38:15 -04:00
parent 2ffd74c684
commit fc3925a1cd
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
3 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -13,6 +13,7 @@ git-annex (6.20170301.2) UNRELEASED; urgency=medium
in the warning message. in the warning message.
* Windows: Improve handling of shebang in external special remote * Windows: Improve handling of shebang in external special remote
program, searching for the program in the PATH. program, searching for the program in the PATH.
* Drop support for building without network-uri.
-- Joey Hess <id@joeyh.name> Thu, 02 Mar 2017 12:51:40 -0400 -- Joey Hess <id@joeyh.name> Thu, 02 Mar 2017 12:51:40 -0400

11
git-annex.cabal
View file

@ -291,10 +291,6 @@ Flag Benchmark
Description: Enable benchmarking Description: Enable benchmarking
Default: False Default: False
Flag network-uri
Description: Get Network.URI from the network-uri package
Default: True
Flag Dbus Flag Dbus
Description: Enable dbus support Description: Enable dbus support
@ -318,6 +314,8 @@ Executable git-annex
stm (>= 2.3), stm (>= 2.3),
mtl (>= 2), mtl (>= 2),
uuid (>= 1.2.6), uuid (>= 1.2.6),
network (>= 2.6),
network-uri (>= 2.6),
process, process,
data-default, data-default,
case-insensitive, case-insensitive,
@ -376,11 +374,6 @@ Executable git-annex
if os(Linux) if os(Linux)
GHC-Options: -optl-Wl,--as-needed 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)) if (os(windows))
Build-Depends: Win32, Win32-extras, unix-compat (>= 0.4.1.3), setenv, Build-Depends: Win32, Win32-extras, unix-compat (>= 0.4.1.3), setenv,
process (>= 1.3.0.0) process (>= 1.3.0.0)

1
stack.yaml
View file

@ -4,7 +4,6 @@ flags:
production: true production: true
assistant: true assistant: true
pairing: true pairing: true
network-uri: true
s3: true s3: true
testsuite: true testsuite: true
webdav: true webdav: true