summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper Van der Jeugt <m@jaspervdj.be>2017-01-22 17:48:58 +0100
committerJasper Van der Jeugt <m@jaspervdj.be>2017-01-22 17:48:58 +0100
commitd0ebefba0e415b2fb1326243b2cd658041f6eb9d (patch)
tree51954b72df102a37cd023176db11dfff91edf9a2
parente2613e056e0f5c8d0af21ff307d45534a21f9487 (diff)
downloadhakyll-d0ebefba0e415b2fb1326243b2cd658041f6eb9d.tar.gz
Bump version to 4.9.4.0
-rw-r--r--.gitignore3
-rw-r--r--CHANGELOG.md (renamed from web/releases.markdown)7
-rw-r--r--hakyll.cabal3
-rw-r--r--web/site.hs22
4 files changed, 25 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index e670565..49f55c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,6 @@ web/_cache
web/_site
web/site
web/reference
+
+# This is generated from the CHANGELOG
+web/releases.markdown
diff --git a/web/releases.markdown b/CHANGELOG.md
index 1d8602d..0984b0b 100644
--- a/web/releases.markdown
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@ title: Releases
# Releases
+## Hakyll 4.9.4.0
+
+- Make `./site check` concurrent
+- Bump directory dependency to 1.3
+- Bump time dependency to 1.7
+- Bump vector dependency to 0.12
+
## Hakyll 4.9.3.0
- Add a `Hakyll.Web.Redirect` module (contribution by gwern)
diff --git a/hakyll.cabal b/hakyll.cabal
index 5ea884d..8a13e9c 100644
--- a/hakyll.cabal
+++ b/hakyll.cabal
@@ -1,5 +1,5 @@
Name: hakyll
-Version: 4.9.3.0
+Version: 4.9.4.0
Synopsis: A static website compiler library
Description:
@@ -62,6 +62,7 @@ Data-files:
templates/rss.xml
Extra-source-files:
+ CHANGELOG.md
tests/data/example.md
tests/data/example.md.metadata
tests/data/images/favicon.ico
diff --git a/web/site.hs b/web/site.hs
index bf84f1e..a20d15b 100644
--- a/web/site.hs
+++ b/web/site.hs
@@ -1,19 +1,24 @@
--------------------------------------------------------------------------------
{-# LANGUAGE OverloadedStrings #-}
-import Control.Arrow (second)
-import Control.Monad (forM_)
-import Data.Char (isDigit)
-import Data.List (isPrefixOf, sortBy)
-import Data.Monoid ((<>))
-import Data.Ord (comparing)
+import Control.Arrow (second)
+import Control.Monad (forM_)
+import Data.Char (isDigit)
+import Data.List (isPrefixOf, sortBy)
+import Data.Monoid ((<>))
+import Data.Ord (comparing)
import Hakyll
-import System.FilePath (dropTrailingPathSeparator, splitPath)
+import System.Directory (copyFile)
+import System.FilePath (dropTrailingPathSeparator, splitPath)
import Text.Pandoc
--------------------------------------------------------------------------------
main :: IO ()
main = hakyllWith config $ do
+ -- Copy CHANGELOG.md here.
+ preprocess $ copyFile "../CHANGELOG.md" "releases.markdown"
+
+ -- CSS
match "css/*" $ do
route idRoute
compile compressCssCompiler
@@ -70,8 +75,7 @@ main = hakyllWith config $ do
where
withToc = defaultHakyllWriterOptions
{ writerTableOfContents = True
- , writerTemplate = "$toc$\n$body$"
- , writerStandalone = True
+ , writerTemplate = Just "$toc$\n$body$"
}