diff options
author | Joey Hess <joeyh@joeyh.name> | 2016-12-24 14:48:51 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2016-12-24 15:01:55 -0400 |
commit | 42e08cd4575d3dc558dfe172c1f28c752d69e8c6 (patch) | |
tree | 78a8eddc31c390aaf8f66435bb13db9366f9a7c4 /git-annex.cabal | |
parent | 34f375526f44ff255d45bbabcd1425b3d5d0bb4a (diff) | |
parent | 3b9d9a267b7c9247d36d9b622e1b836724ca5fb0 (diff) |
Merge branch 'master' into no-xmpp
Diffstat (limited to 'git-annex.cabal')
-rw-r--r-- | git-annex.cabal | 39 |
1 files changed, 28 insertions, 11 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index 6f9d75ca0..3b485aaed 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 6.20161111 +Version: 6.20161210 Cabal-Version: >= 1.8 License: GPL-3 Maintainer: Joey Hess <id@joeyh.name> @@ -59,6 +59,7 @@ Extra-Source-Files: doc/git-annex-dropunused.mdwn doc/git-annex-edit.mdwn doc/git-annex-enableremote.mdwn + doc/git-annex-enable-tor.mdwn doc/git-annex-examinekey.mdwn doc/git-annex-expire.mdwn doc/git-annex-find.mdwn @@ -90,6 +91,7 @@ Extra-Source-Files: doc/git-annex-mirror.mdwn doc/git-annex-move.mdwn doc/git-annex-numcopies.mdwn + doc/git-annex-p2p.mdwn doc/git-annex-pre-commit.mdwn doc/git-annex-preferred-content.mdwn doc/git-annex-proxy.mdwn @@ -135,6 +137,7 @@ Extra-Source-Files: doc/git-annex-watch.mdwn doc/git-annex-webapp.mdwn doc/git-annex-whereis.mdwn + doc/git-remote-tor-annex.mdwn doc/logo.svg doc/logo_16x16.png Build/mdwn2man @@ -327,6 +330,7 @@ Executable git-annex MissingH, hslogger, monad-logger, + free, utf8-string, bytestring, text, @@ -338,21 +342,21 @@ Executable git-annex resourcet, http-client, http-types, - -- Old version needed due to https://github.com/aristidb/aws/issues/206 - http-conduit (<2.2.0), + http-conduit, time, old-locale, esqueleto, persistent-sqlite, - -- Old version needed due to - -- https://github.com/prowdsponsor/esqueleto/issues/137 - -- and also temporarily to make ghc 8 builds work - persistent (< 2.5), + persistent, persistent-template, aeson, unordered-containers, feed, - regex-tdfa + regex-tdfa, + socks, + byteable, + stm-chans, + securemem CC-Options: -Wall GHC-Options: -Wall -fno-warn-tabs Extensions: PackageImports @@ -455,9 +459,7 @@ Executable git-annex crypto-api, clientsession, template-haskell, - shakespeare (>= 2.0.0), - securemem, - byteable + shakespeare (>= 2.0.0) CPP-Options: -DWITH_WEBAPP if flag(Pairing) @@ -491,6 +493,7 @@ Executable git-annex Annex.Branch.Transitions Annex.BranchState Annex.CatFile + Annex.ChangedRefs Annex.CheckAttr Annex.CheckIgnore Annex.Common @@ -672,6 +675,7 @@ Executable git-annex CmdLine.GitAnnexShell.Fields CmdLine.GlobalSetter CmdLine.Option + CmdLine.GitRemoteTorAnnex CmdLine.Seek CmdLine.Usage Command @@ -695,6 +699,7 @@ Executable git-annex Command.DropKey Command.DropUnused Command.EnableRemote + Command.EnableTor Command.ExamineKey Command.Expire Command.Find @@ -730,6 +735,7 @@ Executable git-annex Command.Move Command.NotifyChanges Command.NumCopies + Command.P2P Command.PreCommit Command.Proxy Command.ReKey @@ -871,6 +877,11 @@ Executable git-annex Messages.Internal Messages.JSON Messages.Progress + P2P.Address + P2P.Annex + P2P.Auth + P2P.IO + P2P.Protocol Remote Remote.BitTorrent Remote.Bup @@ -895,6 +906,7 @@ Executable git-annex Remote.Helper.Ssh Remote.Hook Remote.List + Remote.P2P Remote.Rsync Remote.Rsync.RsyncUrl Remote.S3 @@ -906,6 +918,7 @@ Executable git-annex RemoteDaemon.Core RemoteDaemon.Transport RemoteDaemon.Transport.GCrypt + RemoteDaemon.Transport.Tor RemoteDaemon.Transport.Ssh RemoteDaemon.Transport.Ssh.Types RemoteDaemon.Types @@ -952,6 +965,7 @@ Executable git-annex Upgrade.V4 Upgrade.V5 Utility.Applicative + Utility.AuthToken Utility.Base64 Utility.Batch Utility.Bloom @@ -999,6 +1013,7 @@ Executable git-annex Utility.LockPool.Windows Utility.LogFile Utility.Lsof + Utility.MagicWormhole Utility.Matcher Utility.Metered Utility.Misc @@ -1026,12 +1041,14 @@ Executable git-annex Utility.Shell Utility.SimpleProtocol Utility.SshConfig + Utility.Su Utility.SystemDirectory Utility.TList Utility.Tense Utility.ThreadLock Utility.ThreadScheduler Utility.Tmp + Utility.Tor Utility.Touch Utility.Url Utility.UserInfo |