04945a5 · hakyll · git.iko.soy

hakyll.cabal+2−2

@@ -180,7 +180,7 @@ Library

180 unordered-containers >= 0.2 && < 0.3,

181 vector >= 0.11 && < 0.12,

182 yaml >= 0.8 && < 0.9,

183− optparse-applicative >= 0.12 && < 0.13

183+ optparse-applicative >= 0.13 && < 0.14

184

185 If flag(previewServer)

186 Build-depends:

@@ -207,7 +207,7 @@ Library

207

208 If flag(checkExternal)

209 Build-depends:

210− http-conduit >= 2.1 && < 2.2,

210+ http-conduit >= 2.2 && < 2.3,

211 http-types >= 0.7 && < 0.10

212 Cpp-options:

213 -DCHECK_EXTERNAL

src/Hakyll/Check.hs+1−2

@@ -236,8 +236,7 @@ checkExternalUrl url = do

236

237 -- Convert exception to a concise form

238 showException e = case cast e of

239− Just (Http.StatusCodeException (Http.Status code msg) _ _) ->

239+ Just (Http.HttpExceptionRequest _ e') -> show e'

240− show code ++ " " ++ unpack msg

241 _ -> head $ words $ show e

240 _ -> head $ words $ show e

242#else

241#else

243checkExternalUrl _ = return ()

242checkExternalUrl _ = return ()

src/Hakyll/Main.hs+2−1

@@ -16,7 +16,8 @@ import System.Exit (ExitCode(ExitSuccess), exitWit

16

17

18--------------------------------------------------------------------------------

19+import Data.Monoid ((<>))

19−import Options.Applicative

20+import Options.Applicative

20

21

22

22--------------------------------------------------------------------------------

23--------------------------------------------------------------------------------