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

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

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
 

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]]

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