aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-02-28 21:36:55 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-02-28 21:37:33 -0400
commit43e7407f8e317f2e05f24041adea09347f90466e (patch)
tree09aebc51eb4e66fd1d8932ca6e53ec330261ad79
parenta763d6dd3e62cea8ccde3091a9874994a1e92dd6 (diff)
depend on warp-tls.. at least for now
-rw-r--r--debian/control1
-rw-r--r--doc/install/fromscratch.mdwn1
-rw-r--r--git-annex.cabal2
3 files changed, 3 insertions, 1 deletions
diff --git a/debian/control b/debian/control
index 46540219a..adcbb8255 100644
--- a/debian/control
+++ b/debian/control
@@ -36,6 +36,7 @@ Build-Depends:
libghc-hamlet-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
libghc-clientsession-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
libghc-warp-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
+ libghc-warp-tls-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
libghc-wai-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
libghc-wai-logger-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
libghc-case-insensitive-dev,
diff --git a/doc/install/fromscratch.mdwn b/doc/install/fromscratch.mdwn
index 210b6ed7f..3843c31fa 100644
--- a/doc/install/fromscratch.mdwn
+++ b/doc/install/fromscratch.mdwn
@@ -41,6 +41,7 @@ quite a lot.
* [wai](http://hackage.haskell.org/package/wai)
* [wai-logger](http://hackage.haskell.org/package/wai-logger)
* [warp](http://hackage.haskell.org/package/warp)
+ * [warp-tls](http://hackage.haskell.org/package/warp-tls)
* [blaze-builder](http://hackage.haskell.org/package/blaze-builder)
* [crypto-api](http://hackage.haskell.org/package/crypto-api)
* [hamlet](http://hackage.haskell.org/package/hamlet)
diff --git a/git-annex.cabal b/git-annex.cabal
index 6b2f821dd..cafd22570 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -176,7 +176,7 @@ Executable git-annex
if flag(Webapp)
Build-Depends:
yesod, yesod-default, yesod-static, yesod-form, yesod-core,
- http-types, transformers, wai, wai-logger, warp,
+ http-types, transformers, wai, wai-logger, warp, warp-tls,
blaze-builder, crypto-api, hamlet, clientsession,
template-haskell, data-default, aeson, network-conduit
CPP-Options: -DWITH_WEBAPP