diff --git a/yesod-newsfeed/Yesod/AtomFeed.hs b/yesod-newsfeed/Yesod/AtomFeed.hs index e212f378..0bd21eac 100644 --- a/yesod-newsfeed/Yesod/AtomFeed.hs +++ b/yesod-newsfeed/Yesod/AtomFeed.hs @@ -1,6 +1,7 @@ {-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE RecordWildCards #-} {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE CPP #-} --------------------------------------------------------- -- -- Module : Yesod.AtomFeed @@ -30,7 +31,11 @@ import qualified Data.ByteString.Char8 as S8 import Data.Text (Text) import Data.Text.Lazy (toStrict) import Text.XML +#if MIN_VERSION_blaze_html(0, 5, 0) +import Text.Blaze.Html.Renderer.Text (renderHtml) +#else import Text.Blaze.Renderer.Text (renderHtml) +#endif newtype RepAtom = RepAtom Content instance HasReps RepAtom where diff --git a/yesod-newsfeed/Yesod/RssFeed.hs b/yesod-newsfeed/Yesod/RssFeed.hs index 807e9caf..e0fca43d 100644 --- a/yesod-newsfeed/Yesod/RssFeed.hs +++ b/yesod-newsfeed/Yesod/RssFeed.hs @@ -1,6 +1,7 @@ {-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE RecordWildCards #-} {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE CPP #-} ------------------------------------------------------------------------------- -- -- Module : Yesod.RssFeed @@ -26,7 +27,11 @@ import qualified Data.ByteString.Char8 as S8 import Data.Text (Text, pack) import Data.Text.Lazy (toStrict) import Text.XML +#if MIN_VERSION_blaze_html(0, 5, 0) +import Text.Blaze.Html.Renderer.Text (renderHtml) +#else import Text.Blaze.Renderer.Text (renderHtml) +#endif newtype RepRss = RepRss Content instance HasReps RepRss where diff --git a/yesod-newsfeed/yesod-newsfeed.cabal b/yesod-newsfeed/yesod-newsfeed.cabal index c1982e4a..aa1d030e 100644 --- a/yesod-newsfeed/yesod-newsfeed.cabal +++ b/yesod-newsfeed/yesod-newsfeed.cabal @@ -1,5 +1,5 @@ name: yesod-newsfeed -version: 1.0.0 +version: 1.0.0.1 license: MIT license-file: LICENSE author: Michael Snoyman, Patrick Brisbin @@ -12,6 +12,10 @@ build-type: Simple homepage: http://www.yesodweb.com/ description: Helper functions and data types for producing News feeds. +flag blaze_html_0_5 + description: use blaze-html 0.5 and blaze-markup 0.5 + default: False + library build-depends: base >= 4 && < 5 , yesod-core >= 1.0 && < 1.1 @@ -20,7 +24,15 @@ library , bytestring >= 0.9.1.4 && < 0.10 , text >= 0.9 && < 0.12 , xml-conduit >= 0.7 && < 0.8 - , blaze-html >= 0.4 && < 0.5 + + if flag(blaze_html_0_5) + build-depends: + blaze-html >= 0.5 && < 0.6 + , blaze-markup >= 0.5.1 && < 0.6 + else + build-depends: + blaze-html >= 0.4 && < 0.5 + exposed-modules: Yesod.AtomFeed , Yesod.RssFeed , Yesod.Feed