git-annex.cabal: Fix network version.

Needed for hostAddressToTuple.

Which means the build flag for the network-uri split is no longer needed.
This commit is contained in:
Joey Hess 2018-07-01 13:07:24 -04:00
parent 7c03156fa4
commit 14557a3ff6
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 3 additions and 11 deletions

View file

@ -7,6 +7,7 @@ git-annex (6.20180627) UNRELEASED; urgency=medium
* addurl: When security configuration prevents downloads with youtube-dl,
still check if the url is one that it supports, and fail downloading
it, instead of downloading the raw web page.
* git-annex.cabal: Fix network version.
-- Joey Hess <id@joeyh.name> Fri, 22 Jun 2018 10:36:22 -0400

View file

@ -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
@ -311,6 +307,8 @@ Executable git-annex
Main-Is: git-annex.hs
Build-Depends:
base (>= 4.6 && < 5.0),
network (>= 2.6.3.0),
network-uri (>= 2.6),
optparse-applicative (>= 0.11.0),
containers (>= 0.5.0.0),
exceptions (>= 0.6),
@ -395,11 +393,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 (>= 2.6.1.0),

View file

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

View file

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