diff options
| -rw-r--r-- | hakyll.cabal | 14 | ||||
| -rw-r--r-- | src/Hakyll/Check.hs | 3 | ||||
| -rw-r--r-- | src/Hakyll/Main.hs | 3 | ||||
| -rw-r--r-- | stack.yaml | 5 | ||||
| -rw-r--r-- | web/examples.markdown | 2 | ||||
| -rw-r--r-- | web/releases.markdown | 7 |
6 files changed, 22 insertions, 12 deletions
diff --git a/hakyll.cabal b/hakyll.cabal index 5d6e1ce..595f95a 100644 --- a/hakyll.cabal +++ b/hakyll.cabal @@ -1,5 +1,5 @@ Name: hakyll -Version: 4.9.0.0 +Version: 4.9.1.0 Synopsis: A static website compiler library Description: @@ -179,8 +179,8 @@ Library time-locale-compat >= 0.1 && < 0.2, unordered-containers >= 0.2 && < 0.3, vector >= 0.11 && < 0.12, - yaml >= 0.8 && < 0.9, - optparse-applicative >= 0.12 && < 0.13 + yaml >= 0.8.11 && < 0.9, + optparse-applicative >= 0.12 && < 0.14 If flag(previewServer) Build-depends: @@ -207,7 +207,7 @@ Library If flag(checkExternal) Build-depends: - http-conduit >= 2.1 && < 2.2, + http-conduit >= 2.2 && < 2.3, http-types >= 0.7 && < 0.10 Cpp-options: -DCHECK_EXTERNAL @@ -237,7 +237,7 @@ Test-suite hakyll-tests TestSuite.Util Build-Depends: - QuickCheck >= 2.8 && < 2.9, + QuickCheck >= 2.8 && < 2.10, tasty >= 0.11 && < 0.12, tasty-hunit >= 0.9 && < 0.10, tasty-quickcheck >= 0.8 && < 0.9, @@ -273,7 +273,7 @@ Test-suite hakyll-tests unordered-containers >= 0.2 && < 0.3, vector >= 0.11 && < 0.12, yaml >= 0.8.11 && < 0.9, - optparse-applicative >= 0.12 && < 0.13 + optparse-applicative >= 0.12 && < 0.14 If flag(previewServer) Build-depends: @@ -300,7 +300,7 @@ Test-suite hakyll-tests If flag(checkExternal) Build-depends: - http-conduit >= 2.1 && < 2.2, + http-conduit >= 2.2 && < 2.3, http-types >= 0.7 && < 0.10 Cpp-options: -DCHECK_EXTERNAL diff --git a/src/Hakyll/Check.hs b/src/Hakyll/Check.hs index 157b5d7..b41b40e 100644 --- a/src/Hakyll/Check.hs +++ b/src/Hakyll/Check.hs @@ -236,8 +236,7 @@ checkExternalUrl url = do -- Convert exception to a concise form showException e = case cast e of - Just (Http.StatusCodeException (Http.Status code msg) _ _) -> - show code ++ " " ++ unpack msg + Just (Http.HttpExceptionRequest _ e') -> show e' _ -> head $ words $ show e #else checkExternalUrl _ = return () diff --git a/src/Hakyll/Main.hs b/src/Hakyll/Main.hs index c46c705..b48743b 100644 --- a/src/Hakyll/Main.hs +++ b/src/Hakyll/Main.hs @@ -16,7 +16,8 @@ import System.Exit (ExitCode(ExitSuccess), exitWit -------------------------------------------------------------------------------- -import Options.Applicative +import Data.Monoid ((<>)) +import Options.Applicative -------------------------------------------------------------------------------- @@ -1,6 +1,7 @@ -resolver: lts-6.22 +resolver: nightly-2016-10-31 extra-package-dbs: [] -extra-deps: [] +extra-deps: + - 'QuickCheck-2.9.2' flags: hakyll: diff --git a/web/examples.markdown b/web/examples.markdown index 9e33345..045175a 100644 --- a/web/examples.markdown +++ b/web/examples.markdown @@ -160,6 +160,8 @@ directly with the default Hakyll site. [source](https://github.com/NicoleRauch/BusinessWebsite) - <http://johnduhamel.io/>, [source](https://github.com/jjduhamel/blog) +- <http://alexanderlobov.ru/>, + [source](https://github.com/alexanderlobov/homepage) ## Hakyll 3.X diff --git a/web/releases.markdown b/web/releases.markdown index 6fd170a..dc19b11 100644 --- a/web/releases.markdown +++ b/web/releases.markdown @@ -4,6 +4,13 @@ title: Releases # Releases +## Hakyll 4.9.1.0 + +- Allow optparse-applicative 0.13, QuickCheck 2.9, and pandoc 1.18 + (contributions by Chris Wong and Felix Yan) +- Fix extra test files for packaging source files (contribution by Julien + Langlois) + ## Hakyll 4.9.0.0 This release switches over some dependencies to alternatives, in order to clean |