From 3f4a870b86a65fff57c33dcf5cf3b11e9ebf6d2a Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 9 Apr 2014 20:49:03 +0300 Subject: [PATCH] Workaround for GHC 7.8.1 regression --- yesod-form/Yesod/Form/Fields.hs | 8 ++++---- yesod-form/yesod-form.cabal | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/yesod-form/Yesod/Form/Fields.hs b/yesod-form/Yesod/Form/Fields.hs index 1516acb4..15771402 100644 --- a/yesod-form/Yesod/Form/Fields.hs +++ b/yesod-form/Yesod/Form/Fields.hs @@ -84,7 +84,7 @@ import Data.Text as T (Text, concat, intercalate, unpack, pack, splitOn) import qualified Data.Text.Read import qualified Data.Map as Map -import Yesod.Persist (selectList, runDB, Filter, SelectOpt, Key, YesodPersist, PersistEntity, PersistQuery, YesodDB) +import Yesod.Persist (selectList, runDB, Filter, SelectOpt, Key, YesodPersist, PersistEntity, PersistQuery) import Control.Arrow ((&&&)) import Control.Applicative ((<$>), (<|>)) @@ -553,9 +553,9 @@ optionsEnum :: (MonadHandler m, Show a, Enum a, Bounded a) => m (OptionList a) optionsEnum = optionsPairs $ map (\x -> (pack $ show x, x)) [minBound..maxBound] optionsPersist :: ( YesodPersist site, PersistEntity a - , PersistQuery (YesodDB site) + , PersistQuery (YesodPersistBackend site (HandlerT site IO)) , PathPiece (Key a) - , PersistEntityBackend a ~ PersistMonadBackend (YesodDB site) + , PersistEntityBackend a ~ PersistMonadBackend (YesodPersistBackend site (HandlerT site IO)) , RenderMessage site msg ) => [Filter a] @@ -581,7 +581,7 @@ optionsPersistKey , PersistQuery (YesodPersistBackend site (HandlerT site IO)) , PathPiece (Key a) , RenderMessage site msg - , PersistEntityBackend a ~ PersistMonadBackend (YesodDB site)) + , PersistEntityBackend a ~ PersistMonadBackend (YesodPersistBackend site (HandlerT site IO))) => [Filter a] -> [SelectOpt a] -> (a -> msg) diff --git a/yesod-form/yesod-form.cabal b/yesod-form/yesod-form.cabal index 890f87e4..c69bfdf9 100644 --- a/yesod-form/yesod-form.cabal +++ b/yesod-form/yesod-form.cabal @@ -1,5 +1,5 @@ name: yesod-form -version: 1.3.8.1 +version: 1.3.8.2 license: MIT license-file: LICENSE author: Michael Snoyman