diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-02-20 12:21:35 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-02-20 12:21:35 -0400 |
| commit | 8c2001efb20dfe68d91e8163722f7d45a0b8d53e (patch) | |
| tree | 65b0a8b5deb319657adc27968e4d0ef601a7ce56 | |
| parent | 27bb75f655fcbd4ed883329615dac0371e93989f (diff) | |
git-annex.cabal: Make crypto-api a dependency even when built w/o webapp and test suite.
The p2p code made it always be needed.
This commit was sponsored by Anthony DeRobertis on Patreon.
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | doc/bugs/crypto-api_is_a_global_dependency_because_of_Utility.AuthToken.mdwn | 1 | ||||
| -rw-r--r-- | git-annex.cabal | 7 |
3 files changed, 6 insertions, 4 deletions
@@ -22,6 +22,8 @@ git-annex (6.20170215) UNRELEASED; urgency=medium * config group groupwanted numcopies schedule wanted required: Avoid displaying extraneous messages about repository auto-init, git-annex branch merging, etc, when being used to get information. + * git-annex.cabal: Make crypto-api a dependency even when built w/o + webapp and test suite. -- Joey Hess <id@joeyh.name> Tue, 14 Feb 2017 15:54:25 -0400 diff --git a/doc/bugs/crypto-api_is_a_global_dependency_because_of_Utility.AuthToken.mdwn b/doc/bugs/crypto-api_is_a_global_dependency_because_of_Utility.AuthToken.mdwn index 29faab8d4..fcde456fd 100644 --- a/doc/bugs/crypto-api_is_a_global_dependency_because_of_Utility.AuthToken.mdwn +++ b/doc/bugs/crypto-api_is_a_global_dependency_because_of_Utility.AuthToken.mdwn @@ -22,3 +22,4 @@ We need to make `crypto-api` into a global dependency. Here is a [patch](https:/ Oh yes! I use it everyday to sync collections of binary files across computers and VM's! +> [[fixed|done]], thanks! --[[Joey]] diff --git a/git-annex.cabal b/git-annex.cabal index 75ce82943..c394693cf 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -361,7 +361,8 @@ Executable git-annex socks, byteable, stm-chans, - securemem + securemem, + crypto-api CC-Options: -Wall GHC-Options: -Wall -fno-warn-tabs Extensions: PackageImports @@ -397,8 +398,7 @@ Executable git-annex Other-Modules: Utility.Touch.Old if flag(TestSuite) - Build-Depends: tasty (>= 0.7), tasty-hunit, tasty-quickcheck, tasty-rerun, - crypto-api + Build-Depends: tasty (>= 0.7), tasty-hunit, tasty-quickcheck, tasty-rerun CPP-Options: -DWITH_TESTSUITE if flag(S3) @@ -461,7 +461,6 @@ Executable git-annex wai, wai-extra, blaze-builder, - crypto-api, clientsession, template-haskell, shakespeare (>= 2.0.0) |