From 05abf0e4e99e7a146505da09d275c56fd0aafad4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 22 Apr 2015 16:19:05 -0400 Subject: Dropped support for older versions of yesod and warp than the ones in Debian Jessie. 466 lines of compat cruft deleted! --- Utility/Yesod.hs | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'Utility/Yesod.hs') diff --git a/Utility/Yesod.hs b/Utility/Yesod.hs index 231bb291e..a8055d34d 100644 --- a/Utility/Yesod.hs +++ b/Utility/Yesod.hs @@ -19,70 +19,38 @@ module Utility.Yesod #endif #if ! MIN_VERSION_yesod(1,4,0) , withUrlRenderer -#endif -#if ! MIN_VERSION_yesod(1,2,0) - , Html #endif ) where -#if MIN_VERSION_yesod(1,2,0) import Yesod as Y -#else -import Yesod as Y hiding (Html) -#endif -#if MIN_VERSION_yesod_form(1,3,8) import Yesod.Form.Bootstrap3 as Y hiding (bfs) -#else -import Assistant.WebApp.Bootstrap3 as Y hiding (bfs) -#endif #ifndef __NO_TH__ import Yesod.Default.Util import Language.Haskell.TH.Syntax (Q, Exp) -#if MIN_VERSION_yesod_default(1,1,0) import Data.Default (def) import Text.Hamlet hiding (Html) #endif -#endif #if ! MIN_VERSION_yesod(1,4,0) -#if MIN_VERSION_yesod(1,2,0) import Data.Text (Text) #endif -#endif #ifndef __NO_TH__ widgetFile :: String -> Q Exp -#if ! MIN_VERSION_yesod_default(1,1,0) -widgetFile = widgetFileNoReload -#else widgetFile = widgetFileNoReload $ def { wfsHamletSettings = defaultHamletSettings { hamletNewlines = AlwaysNewlines } } -#endif hamletTemplate :: FilePath -> FilePath hamletTemplate f = globFile "hamlet" f #endif {- Lift Handler to Widget -} -#if MIN_VERSION_yesod(1,2,0) liftH :: Monad m => HandlerT site m a -> WidgetT site m a liftH = handlerToWidget -#else -liftH :: MonadLift base m => base a -> m a -liftH = lift -#endif -{- Misc new names for stuff. -} -#if ! MIN_VERSION_yesod(1,2,0) -withUrlRenderer :: forall master sub. HtmlUrl (Route master) -> GHandler sub master RepHtml -withUrlRenderer = hamletToRepHtml - -type Html = RepHtml -#else #if ! MIN_VERSION_yesod_core(1,2,20) withUrlRenderer :: MonadHandler m => ((Route (HandlerSite m) -> [(Text, Text)] -> Text) -> output) -> m output withUrlRenderer = giveUrlRenderer #endif -#endif -- cgit v1.2.3