diff --git a/yesod-auth/Yesod/Auth/OpenId.hs b/yesod-auth/Yesod/Auth/OpenId.hs index d499904e..5e216bf6 100644 --- a/yesod-auth/Yesod/Auth/OpenId.hs +++ b/yesod-auth/Yesod/Auth/OpenId.hs @@ -44,10 +44,14 @@ authOpenId idType extensionFields = name = "openid_identifier" login tm = do ident <- lift newIdent - toWidget [cassius|##{ident} + -- FIXME this is a hack to get GHC 7.6's type checker to allow the + -- code, but it shouldn't be necessary + let y :: a -> [(Text, Text)] -> Text + y = undefined + toWidget (\x -> [cassius|##{ident} background: #fff url(http://www.myopenid.com/static/openid-icon-small.gif) no-repeat scroll 0pt 50%; padding-left: 18px; -|] +|] $ x `asTypeOf` y) [whamlet| $newline never
diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal index 858265c2..2c7b0e56 100644 --- a/yesod-auth/yesod-auth.cabal +++ b/yesod-auth/yesod-auth.cabal @@ -1,5 +1,5 @@ name: yesod-auth -version: 1.1.1 +version: 1.1.1.1 license: MIT license-file: LICENSE author: Michael Snoyman, Patrick Brisbin diff --git a/yesod-core/Yesod/Handler.hs b/yesod-core/Yesod/Handler.hs index d6c54ef3..103dd905 100644 --- a/yesod-core/Yesod/Handler.hs +++ b/yesod-core/Yesod/Handler.hs @@ -1046,10 +1046,14 @@ instance MonadUnsafeIO (GHandler sub master) where instance MonadThrow (GHandler sub master) where monadThrow = liftIO . throwIO instance MonadResource (GHandler sub master) where +#if MIN_VERSION_resourcet(0,4,0) + liftResourceT = lift . liftResourceT +#else allocate a = lift . allocate a register = lift . register release = lift . release resourceMask = lift . resourceMask +#endif instance MonadLogger (GHandler sub master) where monadLoggerLog a b c = do diff --git a/yesod-core/Yesod/Widget.hs b/yesod-core/Yesod/Widget.hs index fd9497b0..9e35cac3 100644 --- a/yesod-core/Yesod/Widget.hs +++ b/yesod-core/Yesod/Widget.hs @@ -341,10 +341,14 @@ instance MonadUnsafeIO (GWidget sub master) where instance MonadThrow (GWidget sub master) where monadThrow = liftIO . throwIO instance MonadResource (GWidget sub master) where +#if MIN_VERSION_resourcet(0,4,0) + liftResourceT = lift . liftResourceT +#else allocate a = lift . allocate a register = lift . register release = lift . release resourceMask = lift . resourceMask +#endif instance MonadLogger (GWidget sub master) where monadLoggerLog a b = lift . monadLoggerLog a b diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index e9ef9403..c157ea20 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -1,5 +1,5 @@ name: yesod-core -version: 1.1.1.1 +version: 1.1.1.2 license: MIT license-file: LICENSE author: Michael Snoyman @@ -74,13 +74,13 @@ library , http-types >= 0.7 && < 0.8 , case-insensitive >= 0.2 , parsec >= 2 && < 3.2 - , directory >= 1 && < 1.2 + , directory >= 1 , vector >= 0.9 && < 0.10 , aeson >= 0.5 - , fast-logger >= 0.2 && < 0.3 + , fast-logger >= 0.2 , monad-logger >= 0.2 && < 0.3 , conduit >= 0.5 && < 0.6 - , resourcet >= 0.3 && < 0.4 + , resourcet >= 0.3 && < 0.5 , lifted-base >= 0.1 && < 0.2 , blaze-html >= 0.5 && < 0.6 , blaze-markup >= 0.5.1 && < 0.6 diff --git a/yesod-form/yesod-form.cabal b/yesod-form/yesod-form.cabal index 2bf05622..f80074e6 100644 --- a/yesod-form/yesod-form.cabal +++ b/yesod-form/yesod-form.cabal @@ -1,5 +1,5 @@ name: yesod-form -version: 1.1.1 +version: 1.1.1.1 license: MIT license-file: LICENSE author: Michael Snoyman diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal index a248e32d..e94e6291 100644 --- a/yesod-static/yesod-static.cabal +++ b/yesod-static/yesod-static.cabal @@ -1,5 +1,5 @@ name: yesod-static -version: 1.1.0 +version: 1.1.0.1 license: MIT license-file: LICENSE author: Michael Snoyman @@ -20,15 +20,15 @@ library , containers >= 0.2 , old-time >= 1.0 , yesod-core >= 1.1 && < 1.2 - , base64-bytestring >= 0.1.0.1 && < 0.2 - , cereal >= 0.3 && < 0.4 + , base64-bytestring >= 0.1.0.1 + , cereal >= 0.3 , bytestring >= 0.9.1.4 , template-haskell - , directory >= 1.0 && < 1.2 - , transformers >= 0.2.2 && < 0.4 + , directory >= 1.0 + , transformers >= 0.2.2 , wai-app-static >= 1.3 && < 1.4 , wai >= 1.3 && < 1.4 - , text >= 0.9 && < 1.0 + , text >= 0.9 , file-embed >= 0.0.4.1 && < 0.5 , http-types >= 0.7 && < 0.8 , unix-compat >= 0.2 @@ -48,24 +48,24 @@ test-suite tests , hspec >= 1.3 && < 1.4 , HUnit -- copy from above - , containers >= 0.2 - , old-time >= 1.0 + , containers + , old-time , yesod-core - , base64-bytestring >= 0.1.0.1 && < 0.2 - , cereal >= 0.3 && < 0.4 - , bytestring >= 0.9.1.4 + , base64-bytestring + , cereal + , bytestring , template-haskell - , directory >= 1.0 && < 1.2 - , transformers >= 0.2.2 && < 0.4 + , directory + , transformers , wai-app-static , wai - , text >= 0.9 && < 1.0 - , file-embed >= 0.0.4.1 && < 0.5 + , text + , file-embed , http-types - , unix-compat >= 0.2 + , unix-compat , conduit , crypto-conduit - , cryptohash >= 0.6.1 + , cryptohash , system-filepath ghc-options: -Wall diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal index 3e56eb91..003b2629 100644 --- a/yesod/yesod.cabal +++ b/yesod/yesod.cabal @@ -1,5 +1,5 @@ name: yesod -version: 1.1.0.2 +version: 1.1.0.3 license: MIT license-file: LICENSE author: Michael Snoyman @@ -90,12 +90,12 @@ executable yesod cpp-options: -DWINDOWS build-depends: base >= 4.3 && < 5 , parsec >= 2.1 && < 4 - , text >= 0.11 && < 0.12 + , text >= 0.11 , shakespeare-text >= 1.0 && < 1.1 , bytestring >= 0.9.1.4 , time >= 1.1.4 , template-haskell - , directory >= 1.0 && < 1.2 + , directory >= 1.0 , Cabal , unix-compat >= 0.2 && < 0.4 , containers >= 0.2