diff options
| author | Joey Hess <joeyh@joeyh.name> | 2018-07-01 13:07:24 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-07-01 13:07:24 -0400 |
| commit | 14557a3ff610c95138adf4aae88d5b3224c59841 (patch) | |
| tree | 5b98d35de1d8d43d633ec2a10cd2070d1e2d8467 /git-annex.cabal | |
| parent | 7c03156fa4358506e5fe9bd975ffb52b87a53bc0 (diff) | |
git-annex.cabal: Fix network version.
Needed for hostAddressToTuple.
Which means the build flag for the network-uri split is no longer needed.
Diffstat (limited to 'git-annex.cabal')
| -rw-r--r-- | git-annex.cabal | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index a497eeae76..fff23c7ea3 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 @@ -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), |