summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hakyll.cabal2
-rw-r--r--src/Hakyll/Core/Compiler/Internal.hs5
-rw-r--r--web/releases.markdown4
3 files changed, 8 insertions, 3 deletions
diff --git a/hakyll.cabal b/hakyll.cabal
index 798625b..4a555b9 100644
--- a/hakyll.cabal
+++ b/hakyll.cabal
@@ -1,5 +1,5 @@
Name: hakyll
-Version: 4.2.1.2
+Version: 4.2.2.0
Synopsis: A static website compiler library
Description:
diff --git a/src/Hakyll/Core/Compiler/Internal.hs b/src/Hakyll/Core/Compiler/Internal.hs
index 267fe26..9aa441d 100644
--- a/src/Hakyll/Core/Compiler/Internal.hs
+++ b/src/Hakyll/Core/Compiler/Internal.hs
@@ -183,8 +183,9 @@ compilerCatch :: Compiler a -> (String -> Compiler a) -> Compiler a
compilerCatch (Compiler x) f = Compiler $ \r -> do
res <- x r
case res of
- CompilerError e -> unCompiler (f e) r
- _ -> return res
+ CompilerDone res' w -> return (CompilerDone res' w)
+ CompilerError e -> unCompiler (f e) r
+ CompilerRequire i c -> return (CompilerRequire i (compilerCatch c f))
{-# INLINE compilerCatch #-}
diff --git a/web/releases.markdown b/web/releases.markdown
index d95f539..2c76812 100644
--- a/web/releases.markdown
+++ b/web/releases.markdown
@@ -4,6 +4,10 @@ title: Releases
# Releases
+## Hakyll 4.2.2.0
+
+- Fix issue with `Alternative` instance of `Compiler`
+
## Hakyll 4.2.1.1
*March 9, 2013*