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

webapp: Fix bug that caused the webapp to hang when built with yesod 1.2.

Browse source
This commit is contained in:
Joey Hess 2013-06-27 00:01:31 -04:00
parent 1e1f595d80
commit b44c978e2c
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Utility/Yesod.hs
View file

@ -42,7 +42,7 @@ hamletTemplate f = globFile "hamlet" f
{- Lift Handler to Widget -} {- Lift Handler to Widget -}
#if MIN_VERSION_yesod(1,2,0) #if MIN_VERSION_yesod(1,2,0)
liftH :: Monad m => HandlerT site m a -> WidgetT site m a liftH :: Monad m => HandlerT site m a -> WidgetT site m a
liftH = liftH liftH = handlerToWidget
#else #else
liftH :: MonadLift base m => base a -> m a liftH :: MonadLift base m => base a -> m a
liftH = lift liftH = lift

4
debian/changelog vendored
View file

@ -14,9 +14,7 @@ git-annex (4.20130622) UNRELEASED; urgency=low
* assistant: Fix bug that prevented adding files written by gnucash, * assistant: Fix bug that prevented adding files written by gnucash,
and more generally support adding hard links to files. However, and more generally support adding hard links to files. However,
other operations on hard links are still unsupported. other operations on hard links are still unsupported.
* Temporarily revert back to building with yesod before 1.2. * webapp: Fix bug that caused the webapp to hang when built with yesod 1.2.
Version 1.2 of yesod, or the new version of warp seem to have a
bug that causes the webapp to hang.
-- Joey Hess <joeyh@debian.org> Fri, 21 Jun 2013 13:16:17 -0400 -- Joey Hess <joeyh@debian.org> Fri, 21 Jun 2013 13:16:17 -0400

2
doc/bugs/Hanging_on_install_on_Mountain_lion.mdwn
View file

@ -22,3 +22,5 @@ I'm using OSX 10.8.4.
# End of transcript or log. # End of transcript or log.
"""]] """]]
> Fixed root cause. [[done]] --[[Joey]]

2
git-annex.cabal
View file

@ -133,7 +133,7 @@ Executable git-annex
if flag(Webapp) if flag(Webapp)
Build-Depends: Build-Depends:
yesod (< 1.2), yesod-default (< 1.2), yesod-static (< 1.2), yesod-form (< 1.3), yesod, yesod-default, yesod-static, yesod-form, yesod-core,
case-insensitive, http-types, transformers, wai, wai-logger, warp, case-insensitive, http-types, transformers, wai, wai-logger, warp,
blaze-builder, crypto-api, hamlet, clientsession, aeson, blaze-builder, crypto-api, hamlet, clientsession, aeson,
template-haskell, data-default template-haskell, data-default