on master help sign in
Merge pull request #64 from markwright/master
0953d9aJasper Van der Jeugt
hakyll.cabal+2−1
@@ -61,7 +61,8 @@ Library
61 Build-Depends:
61 Build-Depends:
62 base >= 4 && < 5,
62 base >= 4 && < 5,
63 binary >= 0.5 && < 0.6,
63 binary >= 0.5 && < 0.6,
64− blaze-html >= 0.4 && < 0.6,
64+ blaze-html >= 0.5 && < 0.6,
65+ blaze-markup >= 0.5.1 && < 0.6,
65 bytestring >= 0.9 && < 0.10,
66 bytestring >= 0.9 && < 0.10,
66 citeproc-hs >= 0.3.2 && < 0.4,
67 citeproc-hs >= 0.3.2 && < 0.4,
67 containers >= 0.3 && < 0.5,
68 containers >= 0.3 && < 0.5,
src/Hakyll/Core/Writable.hs+2−2
@@ -9,8 +9,8 @@ import Data.Word (Word8)
9
9
10import qualified Data.ByteString as SB
10import qualified Data.ByteString as SB
11import qualified Data.ByteString.Lazy as LB
11import qualified Data.ByteString.Lazy as LB
12−import Text.Blaze (Html)
12+import Text.Blaze.Html (Html)
13−import Text.Blaze.Renderer.String (renderHtml)
13+import Text.Blaze.Html.Renderer.String (renderHtml)
14
14
15import Hakyll.Core.Identifier
15import Hakyll.Core.Identifier
16
16
src/Hakyll/Web/Blaze.hs+2−1
@@ -7,7 +7,8 @@ module Hakyll.Web.Blaze
7 , getBodyHtml'
7 , getBodyHtml'
8 ) where
8 ) where
9
9
10−import Text.Blaze (Html, toHtml, preEscapedString)
10+import Text.Blaze.Html (Html, toHtml)
11+import Text.Blaze.Internal (preEscapedString)
11
12
12import Hakyll.Web.Page
13import Hakyll.Web.Page
13import Hakyll.Web.Page.Metadata
14import Hakyll.Web.Page.Metadata
src/Hakyll/Web/Tags.hs+2−2
@@ -52,8 +52,8 @@ import Data.Monoid (mconcat)
52
52
53import Data.Typeable (Typeable)
53import Data.Typeable (Typeable)
54import Data.Binary (Binary, get, put)
54import Data.Binary (Binary, get, put)
55−import Text.Blaze.Renderer.String (renderHtml)
55+import Text.Blaze.Html.Renderer.String (renderHtml)
56−import Text.Blaze ((!), toHtml, toValue)
56+import Text.Blaze.Html ((!), toHtml, toValue)
57import qualified Text.Blaze.Html5 as H
57import qualified Text.Blaze.Html5 as H
58import qualified Text.Blaze.Html5.Attributes as A
58import qualified Text.Blaze.Html5.Attributes as A
59
59
src/Hakyll/Web/Util/Html.hs+2−2
@@ -5,8 +5,8 @@ module Hakyll.Web.Util.Html
5 , escapeHtml
5 , escapeHtml
6 ) where
6 ) where
7
7
8−import Text.Blaze (toHtml)
8+import Text.Blaze.Html (toHtml)
9−import Text.Blaze.Renderer.String (renderHtml)
9+import Text.Blaze.Html.Renderer.String (renderHtml)
10
10
11-- | Strip all HTML tags from a string
11-- | Strip all HTML tags from a string
12--
12--