Merge pull request #64 from markwright/master

changes for blaze-html 0.5

4 files changed, 8 insertions, 7 deletions

diff --git a/src/Hakyll/Core/Writable.hs b/src/Hakyll/Core/Writable.hs
index d001f00..d2c9a02 100644
--- a/src/Hakyll/Core/Writable.hs
+++ b/src/Hakyll/Core/Writable.hs
@@ -9,8 +9,8 @@ import Data.Word (Word8)
 
 import qualified Data.ByteString as SB
 import qualified Data.ByteString.Lazy as LB
-import Text.Blaze (Html)
-import Text.Blaze.Renderer.String (renderHtml)
+import Text.Blaze.Html (Html)
+import Text.Blaze.Html.Renderer.String (renderHtml)
 
 import Hakyll.Core.Identifier
 
diff --git a/src/Hakyll/Web/Blaze.hs b/src/Hakyll/Web/Blaze.hs
index f79f036..8a22585 100644
--- a/src/Hakyll/Web/Blaze.hs
+++ b/src/Hakyll/Web/Blaze.hs
@@ -7,7 +7,8 @@ module Hakyll.Web.Blaze
     , getBodyHtml'
     ) where
 
-import Text.Blaze (Html, toHtml, preEscapedString)
+import Text.Blaze.Html (Html, toHtml)
+import Text.Blaze.Internal (preEscapedString)
 
 import Hakyll.Web.Page
 import Hakyll.Web.Page.Metadata
diff --git a/src/Hakyll/Web/Tags.hs b/src/Hakyll/Web/Tags.hs
index 7c9abbb..62f3899 100644
--- a/src/Hakyll/Web/Tags.hs
+++ b/src/Hakyll/Web/Tags.hs
@@ -52,8 +52,8 @@ import Data.Monoid (mconcat)
 
 import Data.Typeable (Typeable)
 import Data.Binary (Binary, get, put)
-import Text.Blaze.Renderer.String (renderHtml)
-import Text.Blaze ((!), toHtml, toValue)
+import Text.Blaze.Html.Renderer.String (renderHtml)
+import Text.Blaze.Html ((!), toHtml, toValue)
 import qualified Text.Blaze.Html5 as H
 import qualified Text.Blaze.Html5.Attributes as A
 
diff --git a/src/Hakyll/Web/Util/Html.hs b/src/Hakyll/Web/Util/Html.hs
index 2a42608..a413f84 100644
--- a/src/Hakyll/Web/Util/Html.hs
+++ b/src/Hakyll/Web/Util/Html.hs
@@ -5,8 +5,8 @@ module Hakyll.Web.Util.Html
     , escapeHtml
     ) where
 
-import Text.Blaze (toHtml)
-import Text.Blaze.Renderer.String (renderHtml)
+import Text.Blaze.Html (toHtml)
+import Text.Blaze.Html.Renderer.String (renderHtml)
 
 -- | Strip all HTML tags from a string
 --