diff options
| -rw-r--r-- | README.markdown | 2 | ||||
| -rw-r--r-- | hakyll.cabal | 9 | ||||
| -rw-r--r-- | src/Hakyll/Core/Configuration.hs | 2 | ||||
| -rw-r--r-- | src/Hakyll/Core/Writable.hs | 4 | ||||
| -rw-r--r-- | src/Hakyll/Web/Blaze.hs | 3 | ||||
| -rw-r--r-- | src/Hakyll/Web/Tags.hs | 4 | ||||
| -rw-r--r-- | src/Hakyll/Web/Util/Html.hs | 4 | ||||
| -rw-r--r-- | tests/Hakyll/Web/Template/Tests.hs | 4 | ||||
| -rw-r--r-- | web/tutorials/02-basics.markdown | 2 |
9 files changed, 20 insertions, 14 deletions
diff --git a/README.markdown b/README.markdown index 9089424..ea89626 100644 --- a/README.markdown +++ b/README.markdown @@ -1,5 +1,7 @@ # hakyll +[](http://travis-ci.org/jaspervdj/hakyll) + Hakyll is a static site generator library in Haskell. More information (including and a tutorial) can be found on [the hakyll homepage](http://jaspervdj.be/hakyll). diff --git a/hakyll.cabal b/hakyll.cabal index 3550968..6a4cc29 100644 --- a/hakyll.cabal +++ b/hakyll.cabal @@ -1,5 +1,5 @@ Name: hakyll -Version: 3.2.7.2 +Version: 3.2.7.3 Synopsis: A static website compiler library Description: @@ -65,14 +65,15 @@ Library Build-Depends: base >= 4 && < 5, binary >= 0.5 && < 0.6, - blaze-html >= 0.4 && < 0.6, + blaze-html >= 0.5 && < 0.6, + blaze-markup >= 0.5.1 && < 0.6, bytestring >= 0.9 && < 0.10, citeproc-hs >= 0.3.2 && < 0.4, containers >= 0.3 && < 0.5, cryptohash >= 0.7 && < 0.8, directory >= 1.0 && < 1.2, filepath >= 1.0 && < 1.4, - hamlet >= 0.10.3 && < 1.1, + hamlet >= 1.0 && < 1.1, mtl >= 1 && < 2.2, old-locale >= 1.0 && < 1.1, old-time >= 1.0 && < 1.2, @@ -82,6 +83,7 @@ Library regex-base >= 0.93 && < 0.94, regex-tdfa >= 1.1 && < 1.2, tagsoup >= 0.12.6 && < 0.13, + text >= 0.11 && < 1.12, time >= 1.1 && < 1.5 Exposed-Modules: @@ -97,6 +99,7 @@ Library Hakyll.Core.Logger Hakyll.Core.Resource Hakyll.Core.Resource.Provider + Hakyll.Core.Resource.Provider.Dummy Hakyll.Core.Resource.Provider.File Hakyll.Core.Routes Hakyll.Core.Rules diff --git a/src/Hakyll/Core/Configuration.hs b/src/Hakyll/Core/Configuration.hs index 82e72b0..3e3c44a 100644 --- a/src/Hakyll/Core/Configuration.hs +++ b/src/Hakyll/Core/Configuration.hs @@ -53,7 +53,7 @@ defaultHakyllConfiguration = HakyllConfiguration , storeDirectory = "_cache" , ignoreFile = ignoreFile' , deployCommand = "echo 'No deploy command specified'" - , inMemoryCache = False + , inMemoryCache = True } where ignoreFile' path 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 -- diff --git a/tests/Hakyll/Web/Template/Tests.hs b/tests/Hakyll/Web/Template/Tests.hs index efbd392..36c4374 100644 --- a/tests/Hakyll/Web/Template/Tests.hs +++ b/tests/Hakyll/Web/Template/Tests.hs @@ -28,9 +28,9 @@ tests = fromAssertions "applyTemplate" -- Hamlet templates , applyTemplateAssertion readHamletTemplate applyTemplate "<head><title>notice</title></head><body>A paragraph</body>" - "<head\n\ + "<head>\n\ \ <title>#{title}\n\ - \<body\n\ + \<body>\n\ \ A paragraph\n" [("title", "notice")] diff --git a/web/tutorials/02-basics.markdown b/web/tutorials/02-basics.markdown index 7acc30f..79cbe30 100644 --- a/web/tutorials/02-basics.markdown +++ b/web/tutorials/02-basics.markdown @@ -145,7 +145,7 @@ good impression: </html> ~~~~~ -A template is a text file to lay our some content. The content it lays out is +A template is a text file to lay out some content. The content it lays out is called a page -- we'll see that in the next section. The syntax for templates is intentionally very simplistic. You can bind some content by referencing the name of the content *field* by using `$$field$$`, and that's it. |