diff options
| -rw-r--r-- | hakyll.cabal | 4 | ||||
| -rw-r--r-- | src/Hakyll/Check.hs | 3 | ||||
| -rw-r--r-- | src/Hakyll/Main.hs | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/hakyll.cabal b/hakyll.cabal index 5d6e1ce..c1385f6 100644 --- a/hakyll.cabal +++ b/hakyll.cabal @@ -180,7 +180,7 @@ Library unordered-containers >= 0.2 && < 0.3, vector >= 0.11 && < 0.12, yaml >= 0.8 && < 0.9, - optparse-applicative >= 0.12 && < 0.13 + optparse-applicative >= 0.13 && < 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 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 -------------------------------------------------------------------------------- |