From 87ebdc8f90289c6d2e3af566cffde6b936c01d01 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 30 Oct 2012 12:59:05 -0400 Subject: [PATCH] add build-dep on blaze-markup which blaze-html depends on, so not a significant new dep --- debian/control | 1 + ...ing_fails:_Could_not_find_module___96__Text.Blaze__39__.mdwn | 2 ++ doc/install/fromscratch.mdwn | 1 + git-annex.cabal | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index c0273ca2e9..d7e38096bc 100644 --- a/debian/control +++ b/debian/control @@ -36,6 +36,7 @@ Build-Depends: libghc-warp-dev, libghc-blaze-builder-dev, libghc-blaze-html-dev, + libghc-blaze-markup-dev, libghc-crypto-api-dev, libghc-network-multicast-dev, libghc-network-info-dev, diff --git a/doc/bugs/Building_fails:_Could_not_find_module___96__Text.Blaze__39__.mdwn b/doc/bugs/Building_fails:_Could_not_find_module___96__Text.Blaze__39__.mdwn index 40ebfcfdc2..b75d92e18b 100644 --- a/doc/bugs/Building_fails:_Could_not_find_module___96__Text.Blaze__39__.mdwn +++ b/doc/bugs/Building_fails:_Could_not_find_module___96__Text.Blaze__39__.mdwn @@ -101,3 +101,5 @@ The Glorious Glasgow Haskell Compilation System, version 7.4.2 $ uname -a Linux Atlantis 3.5.0-17-generic #28-Ubuntu SMP Tue Oct 9 19:31:23 UTC 2012 x86_64 x86_64 x86_64 GNU/Linux + +> [[done]] --[[Joey]] diff --git a/doc/install/fromscratch.mdwn b/doc/install/fromscratch.mdwn index 57b92237ed..32dad01ecc 100644 --- a/doc/install/fromscratch.mdwn +++ b/doc/install/fromscratch.mdwn @@ -37,6 +37,7 @@ quite a lot. * [warp](http://hackage.haskell.org/package/warp) * [blaze-builder](http://hackage.haskell.org/package/blaze-builder) * [blaze-html](http://hackage.haskell.org/package/blaze-html) + * [blaze-markup](http://hackage.haskell.org/package/blaze-markup) * [crypto-api](http://hackage.haskell.org/package/crypto-api) * [hamlet](http://hackage.haskell.org/package/hamlet) * [clientsession](http://hackage.haskell.org/package/clientsession) diff --git a/git-annex.cabal b/git-annex.cabal index 7d83239a0f..95b183cf3f 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -89,7 +89,7 @@ Executable git-annex if flag(Webapp) && flag(Assistant) Build-Depends: yesod, yesod-static, case-insensitive, http-types, transformers, wai, wai-logger, warp, blaze-builder, - blaze-html, crypto-api, hamlet, clientsession, + blaze-html, blaze-markup, crypto-api, hamlet, clientsession, template-haskell, yesod-default (>= 1.1.0), data-default CPP-Options: -DWITH_WEBAPP