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

Fix build with yesod 1.6.

Browse source 
Also avoid some depreaction warnings.
This commit is contained in:
Joey Hess 2018-04-22 13:56:35 -04:00
parent 1cb300e68a
commit aebf9e6dd5
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Assistant/WebApp/Form.hs
View file

@ -7,6 +7,7 @@
{-# LANGUAGE FlexibleContexts, TypeFamilies, QuasiQuotes #-} {-# LANGUAGE FlexibleContexts, TypeFamilies, QuasiQuotes #-}
{-# LANGUAGE MultiParamTypeClasses, TemplateHaskell #-} {-# LANGUAGE MultiParamTypeClasses, TemplateHaskell #-}
{-# LANGUAGE CPP #-}
{-# LANGUAGE OverloadedStrings, RankNTypes #-} {-# LANGUAGE OverloadedStrings, RankNTypes #-}
module Assistant.WebApp.Form where module Assistant.WebApp.Form where
@ -67,7 +68,11 @@ withExpandableNote field (toggle, note) = withNote field $ [whamlet|
ident = "toggle_" ++ toggle ident = "toggle_" ++ toggle
{- Adds a check box to an AForm to control encryption. -} {- Adds a check box to an AForm to control encryption. -}
#if MIN_VERSION_yesod_core(1,6,0)
enableEncryptionField :: (RenderMessage site FormMessage) => AForm (HandlerFor site) EnableEncryption
#else
enableEncryptionField :: (RenderMessage site FormMessage) => AForm (HandlerT site IO) EnableEncryption enableEncryptionField :: (RenderMessage site FormMessage) => AForm (HandlerT site IO) EnableEncryption
#endif
enableEncryptionField = areq (selectFieldList choices) (bfs "Encryption") (Just SharedEncryption) enableEncryptionField = areq (selectFieldList choices) (bfs "Encryption") (Just SharedEncryption)
where where
choices :: [(Text, EnableEncryption)] choices :: [(Text, EnableEncryption)]

9
Assistant/WebApp/Types.hs
View file

@ -8,6 +8,7 @@
{-# LANGUAGE TypeFamilies, QuasiQuotes, MultiParamTypeClasses #-} {-# LANGUAGE TypeFamilies, QuasiQuotes, MultiParamTypeClasses #-}
{-# LANGUAGE TemplateHaskell, OverloadedStrings, RankNTypes #-} {-# LANGUAGE TemplateHaskell, OverloadedStrings, RankNTypes #-}
{-# LANGUAGE FlexibleInstances, FlexibleContexts, ViewPatterns #-} {-# LANGUAGE FlexibleInstances, FlexibleContexts, ViewPatterns #-}
{-# LANGUAGE CPP #-}
{-# OPTIONS_GHC -fno-warn-orphans #-} {-# OPTIONS_GHC -fno-warn-orphans #-}
module Assistant.WebApp.Types ( module Assistant.WebApp.Types (
@ -94,7 +95,11 @@ instance LiftAnnex Handler where
, liftAssistant $ liftAnnex a , liftAssistant $ liftAnnex a
) )
#if MIN_VERSION_yesod_core(1,6,0)
instance LiftAnnex (WidgetFor WebApp) where
#else
instance LiftAnnex (WidgetT WebApp IO) where instance LiftAnnex (WidgetT WebApp IO) where
#endif
liftAnnex = liftH . liftAnnex liftAnnex = liftH . liftAnnex
class LiftAssistant m where class LiftAssistant m where
@ -104,7 +109,11 @@ instance LiftAssistant Handler where
liftAssistant a = liftIO . flip runAssistant a liftAssistant a = liftIO . flip runAssistant a
=<< assistantData <$> getYesod =<< assistantData <$> getYesod
#if MIN_VERSION_yesod_core(1,6,0)
instance LiftAssistant (WidgetFor WebApp) where
#else
instance LiftAssistant (WidgetT WebApp IO) where instance LiftAssistant (WidgetT WebApp IO) where
#endif
liftAssistant = liftH . liftAssistant liftAssistant = liftH . liftAssistant
type MkMForm x = MForm Handler (FormResult x, Widget) type MkMForm x = MForm Handler (FormResult x, Widget)

1
CHANGELOG
View file

@ -9,6 +9,7 @@ git-annex (6.20180410) UNRELEASED; urgency=medium
as the move does not result in there being fewer copies. as the move does not result in there being fewer copies.
* Fix mangling of --json output of utf-8 characters when not * Fix mangling of --json output of utf-8 characters when not
running in a utf-8 locale. running in a utf-8 locale.
* Fix build with yesod 1.6.
-- Joey Hess <id@joeyh.name> Mon, 09 Apr 2018 14:03:28 -0400 -- Joey Hess <id@joeyh.name> Mon, 09 Apr 2018 14:03:28 -0400

4
Utility/Yesod.hs
View file

@ -47,7 +47,11 @@ hamletTemplate f = globFile "hamlet" f
#endif #endif
{- Lift Handler to Widget -} {- Lift Handler to Widget -}
#if MIN_VERSION_yesod_core(1,6,0)
liftH :: HandlerFor site a -> WidgetFor site a
#else
liftH :: Monad m => HandlerT site m a -> WidgetT site m a liftH :: Monad m => HandlerT site m a -> WidgetT site m a
#endif
liftH = handlerToWidget liftH = handlerToWidget
#if ! MIN_VERSION_yesod_core(1,2,20) #if ! MIN_VERSION_yesod_core(1,2,20)