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

git-annex.cabal: Make crypto-api a dependency even when built w/o webapp and test suite.

Browse source 
The p2p code made it always be needed.

This commit was sponsored by Anthony DeRobertis on Patreon.
This commit is contained in:
Joey Hess 2017-02-20 12:21:35 -04:00
parent f31aadc7c2
commit c5cf5cf03a
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -22,6 +22,8 @@ git-annex (6.20170215) UNRELEASED; urgency=medium
* config group groupwanted numcopies schedule wanted required: * config group groupwanted numcopies schedule wanted required:
Avoid displaying extraneous messages about repository auto-init, Avoid displaying extraneous messages about repository auto-init,
git-annex branch merging, etc, when being used to get information. 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 -- Joey Hess <id@joeyh.name> Tue, 14 Feb 2017 15:54:25 -0400

1
doc/bugs/crypto-api_is_a_global_dependency_because_of_Utility.AuthToken.mdwn
View file

@ -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! Oh yes! I use it everyday to sync collections of binary files across computers and VM's!
> [[fixed|done]], thanks! --[[Joey]]

7
git-annex.cabal
View file

@ -361,7 +361,8 @@ Executable git-annex
socks, socks,
byteable, byteable,
stm-chans, stm-chans,
securemem securemem,
crypto-api
CC-Options: -Wall CC-Options: -Wall
GHC-Options: -Wall -fno-warn-tabs GHC-Options: -Wall -fno-warn-tabs
Extensions: PackageImports Extensions: PackageImports
@ -397,8 +398,7 @@ Executable git-annex
Other-Modules: Utility.Touch.Old Other-Modules: Utility.Touch.Old
if flag(TestSuite) if flag(TestSuite)
Build-Depends: tasty (>= 0.7), tasty-hunit, tasty-quickcheck, tasty-rerun, Build-Depends: tasty (>= 0.7), tasty-hunit, tasty-quickcheck, tasty-rerun
crypto-api
CPP-Options: -DWITH_TESTSUITE CPP-Options: -DWITH_TESTSUITE
if flag(S3) if flag(S3)
@ -461,7 +461,6 @@ Executable git-annex
wai, wai,
wai-extra, wai-extra,
blaze-builder, blaze-builder,
crypto-api,
clientsession, clientsession,
template-haskell, template-haskell,
shakespeare (>= 2.0.0) shakespeare (>= 2.0.0)