diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-06-27 00:01:31 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-06-27 00:01:31 -0400 |
| commit | 8936ea18708940e167ff383731fad5e863b16000 (patch) | |
| tree | 9948d5f1a91d1854e7364d3052b11ee55220da3b | |
| parent | c4b714b7070ce472fd56ab5d786719e72c46ac71 (diff) | |
webapp: Fix bug that caused the webapp to hang when built with yesod 1.2.
| -rw-r--r-- | Utility/Yesod.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | doc/bugs/Hanging_on_install_on_Mountain_lion.mdwn | 2 | ||||
| -rw-r--r-- | git-annex.cabal | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Utility/Yesod.hs b/Utility/Yesod.hs index e437326b0..cb5c68c82 100644 --- a/Utility/Yesod.hs +++ b/Utility/Yesod.hs @@ -42,7 +42,7 @@ hamletTemplate f = globFile "hamlet" f {- Lift Handler to Widget -} #if MIN_VERSION_yesod(1,2,0) liftH :: Monad m => HandlerT site m a -> WidgetT site m a -liftH = liftH +liftH = handlerToWidget #else liftH :: MonadLift base m => base a -> m a liftH = lift diff --git a/debian/changelog b/debian/changelog index a81c3e806..9cb2548a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,9 +14,7 @@ git-annex (4.20130622) UNRELEASED; urgency=low * assistant: Fix bug that prevented adding files written by gnucash, and more generally support adding hard links to files. However, other operations on hard links are still unsupported. - * Temporarily revert back to building with yesod before 1.2. - Version 1.2 of yesod, or the new version of warp seem to have a - bug that causes the webapp to hang. + * webapp: Fix bug that caused the webapp to hang when built with yesod 1.2. -- Joey Hess <joeyh@debian.org> Fri, 21 Jun 2013 13:16:17 -0400 diff --git a/doc/bugs/Hanging_on_install_on_Mountain_lion.mdwn b/doc/bugs/Hanging_on_install_on_Mountain_lion.mdwn index dc55089e4..f18a0ef40 100644 --- a/doc/bugs/Hanging_on_install_on_Mountain_lion.mdwn +++ b/doc/bugs/Hanging_on_install_on_Mountain_lion.mdwn @@ -22,3 +22,5 @@ I'm using OSX 10.8.4. # End of transcript or log. """]] + +> Fixed root cause. [[done]] --[[Joey]] diff --git a/git-annex.cabal b/git-annex.cabal index 78d5dbbac..a7a1c31e1 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -133,7 +133,7 @@ Executable git-annex if flag(Webapp) 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, blaze-builder, crypto-api, hamlet, clientsession, aeson, template-haskell, data-default |