haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conduit 1.0 support

Browse Source
This commit is contained in:
Michael Snoyman 2013-02-13 11:45:50 +02:00
parent 61624e1536
commit a1734e0e18
10 changed files with 42 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yesod-core/Yesod/Handler.hs
View File

@ -1056,10 +1056,16 @@ instance MonadResource (GHandler sub master) where
#endif #endif
instance MonadLogger (GHandler sub master) where instance MonadLogger (GHandler sub master) where
#if MIN_VERSION_monad_logger(0, 3, 0)
monadLoggerLog a b c d = do
hd <- ask
liftIO $ handlerLog hd a b c (toLogStr d)
#else
monadLoggerLog a c d = monadLoggerLogSource a "" c d monadLoggerLog a c d = monadLoggerLogSource a "" c d
monadLoggerLogSource a b c d = do monadLoggerLogSource a b c d = do
hd <- ask hd <- ask
liftIO $ handlerLog hd a b c (toLogStr d) liftIO $ handlerLog hd a b c (toLogStr d)
#endif
instance Exception e => Failure e (GHandler sub master) where instance Exception e => Failure e (GHandler sub master) where
failure = liftIO . throwIO failure = liftIO . throwIO

4
yesod-core/Yesod/Widget.hs
View File

@ -361,5 +361,9 @@ instance MonadResource (GWidget sub master) where
#endif #endif
instance MonadLogger (GWidget sub master) where instance MonadLogger (GWidget sub master) where
#if MIN_VERSION_monad_logger(0, 3, 0)
monadLoggerLog a b c = lift . monadLoggerLog a b c
#else
monadLoggerLog a b = lift . monadLoggerLog a b monadLoggerLog a b = lift . monadLoggerLog a b
monadLoggerLogSource a b c = lift . monadLoggerLogSource a b c monadLoggerLogSource a b c = lift . monadLoggerLogSource a b c
#endif

4
yesod-core/yesod-core.cabal
View File

@ -79,8 +79,8 @@ library
, vector >= 0.9 && < 0.11 , vector >= 0.9 && < 0.11
, aeson >= 0.5 , aeson >= 0.5
, fast-logger >= 0.2 , fast-logger >= 0.2
, monad-logger >= 0.2.1 && < 0.3 , monad-logger >= 0.2.1 && < 0.4
, conduit >= 0.5 && < 0.6 , conduit >= 0.5
, resourcet >= 0.3 && < 0.5 , resourcet >= 0.3 && < 0.5
, lifted-base >= 0.1 , lifted-base >= 0.1
, blaze-html >= 0.5 && < 0.6 , blaze-html >= 0.5 && < 0.6

2
yesod-default/yesod-default.cabal
View File

@ -30,7 +30,7 @@ library
, shakespeare-js >= 1.0 && < 1.2 , shakespeare-js >= 1.0 && < 1.2
, template-haskell , template-haskell
, yaml >= 0.8 && < 0.9 , yaml >= 0.8 && < 0.9
, network-conduit >= 0.5 && < 0.7 , network-conduit >= 0.5
, unordered-containers , unordered-containers
, hamlet >= 1.1 && < 1.2 , hamlet >= 1.1 && < 1.2
, data-default , data-default

20
yesod-json/yesod-json.cabal
View File

@ -14,21 +14,21 @@ description: Generate content for Yesod using the aeson package.
library library
build-depends: base >= 4 && < 5 build-depends: base >= 4 && < 5
, yesod-core >= 1.1 && < 1.2 , yesod-core >= 1.1
, yesod-routes >= 1.1 && < 1.2 , yesod-routes >= 1.1
, aeson >= 0.5 , aeson >= 0.5
, text >= 0.8 && < 1.0 , text >= 0.8
, shakespeare-js >= 1.0 && < 1.2 , shakespeare-js >= 1.0
, vector >= 0.9 , vector >= 0.9
, containers >= 0.2 , containers >= 0.2
, blaze-builder , blaze-builder
, attoparsec-conduit >= 0.5 && < 0.6 , attoparsec-conduit >= 0.5
, conduit >= 0.5 && < 0.6 , conduit >= 0.5
, transformers >= 0.2.2 && < 0.4 , transformers >= 0.2.2
, wai >= 1.3 && < 1.4 , wai >= 1.3
, wai-extra >= 1.3 && < 1.4 , wai-extra >= 1.3
, bytestring >= 0.9 , bytestring >= 0.9
, safe >= 0.2 && < 0.4 , safe >= 0.2
exposed-modules: Yesod.Json exposed-modules: Yesod.Json
ghc-options: -Wall ghc-options: -Wall

8
yesod-newsfeed/yesod-newsfeed.cabal
View File

@ -18,10 +18,10 @@ library
, time >= 1.1.4 , time >= 1.1.4
, hamlet >= 1.1 && < 1.2 , hamlet >= 1.1 && < 1.2
, bytestring >= 0.9.1.4 , bytestring >= 0.9.1.4
, text >= 0.9 && < 0.12 , text >= 0.9
, xml-conduit >= 1.0 && < 1.1 , xml-conduit >= 1.0
, blaze-html >= 0.5 && < 0.6 , blaze-html >= 0.5
, blaze-markup >= 0.5.1 && < 0.6 , blaze-markup >= 0.5.1
, containers , containers
exposed-modules: Yesod.AtomFeed exposed-modules: Yesod.AtomFeed

2
yesod-sitemap/yesod-sitemap.cabal
View File

@ -16,7 +16,7 @@ library
build-depends: base >= 4 && < 5 build-depends: base >= 4 && < 5
, yesod-core >= 1.1 && < 1.2 , yesod-core >= 1.1 && < 1.2
, time >= 1.1.4 , time >= 1.1.4
, xml-conduit >= 1.0 && < 1.1 , xml-conduit >= 1.0
, text , text
, containers , containers
exposed-modules: Yesod.Sitemap exposed-modules: Yesod.Sitemap

4
yesod-static/yesod-static.cabal
View File

@ -36,8 +36,8 @@ library
, file-embed >= 0.0.4.1 && < 0.5 , file-embed >= 0.0.4.1 && < 0.5
, http-types >= 0.7 , http-types >= 0.7
, unix-compat >= 0.2 , unix-compat >= 0.2
, conduit >= 0.5 && < 0.6 , conduit >= 0.5
, crypto-conduit >= 0.4 && < 0.5 , crypto-conduit >= 0.4
, cryptohash >= 0.6.1 , cryptohash >= 0.6.1
, system-filepath >= 0.4.6 && < 0.5 , system-filepath >= 0.4.6 && < 0.5
exposed-modules: Yesod.Static exposed-modules: Yesod.Static

22
yesod-test/yesod-test.cabal
View File

@ -15,24 +15,24 @@ extra-source-files: README.md, LICENSE, test/main.hs
library library
build-depends: base >= 4.3 && < 5 build-depends: base >= 4.3 && < 5
, attoparsec >= 0.10 && < 0.11 , attoparsec >= 0.10
, persistent >= 1.0 && < 1.2 , persistent >= 1.0
, transformers >= 0.2.2 && < 0.4 , transformers >= 0.2.2
, wai >= 1.3 && < 1.4 , wai >= 1.3
, wai-test >= 1.3 && < 1.4 , wai-test >= 1.3
, network >= 2.2 , network >= 2.2
, http-types >= 0.7 , http-types >= 0.7
, HUnit >= 1.2 && < 1.3 , HUnit >= 1.2
, hspec >= 1.4 , hspec >= 1.4
, bytestring >= 0.9 , bytestring >= 0.9
, case-insensitive >= 0.2 , case-insensitive >= 0.2
, text , text
, xml-conduit >= 1.0 && < 1.1 , xml-conduit >= 1.0
, xml-types >= 0.3 && < 0.4 , xml-types >= 0.3
, containers , containers
, html-conduit >= 0.1 && < 0.2 , html-conduit >= 0.1
, blaze-html >= 0.5 && < 0.6 , blaze-html >= 0.5
, blaze-markup >= 0.5.1 && < 0.6 , blaze-markup >= 0.5.1
, pool-conduit , pool-conduit
, monad-control , monad-control
, time , time

2
yesod/yesod.cabal
View File

@ -101,7 +101,7 @@ executable yesod
, fsnotify >= 0.0 && < 0.1 , fsnotify >= 0.0 && < 0.1
, split >= 0.2 && < 0.3 , split >= 0.2 && < 0.3
, file-embed , file-embed
, conduit >= 0.5 && < 0.6 , conduit >= 0.5 && < 1.1
, resourcet >= 0.3 && < 0.5 , resourcet >= 0.3 && < 0.5
, base64-bytestring , base64-bytestring
, lifted-base , lifted-base