Merge pull request jaspervdj#478 from lfairy/update-deps

Update dependencies!
Zekt · Oct 31, 2016 · 04945a5 · 04945a5
2 parents ab34240 + 218d683
commit 04945a5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -16,7 +16,8 @@ import           System.Exit                     (ExitCode(ExitSuccess), exitWit
 
 
 --------------------------------------------------------------------------------
-import Options.Applicative
+import           Data.Monoid                     ((<>))
+import           Options.Applicative
 
 
 --------------------------------------------------------------------------------
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,8 @@ import System.Exit (ExitCode(ExitSuccess), exitWit @@
     --------------------------------------------------------------------------------
-    import Options.Applicative
+    import           Data.Monoid                     ((<>))
+    import           Options.Applicative
     --------------------------------------------------------------------------------
@@ Expand Down @@