04945a5 · hakyll · git.iko.soy

git.iko.soy/hakyll

Merge pull request #478 from lfairy/update-deps

Update dependencies!

commit04945a51d8d61142939ec0d9b2dd6c12f02ab1bc authorJasper Van der Jeugt <jaspervdj@gmail.com> dateMon 31 Oct 2016, 11:06 (10 years ago) parentab34240 218d683

3 files changed+5−5

compare with master

unifiedsplit

hakyll.cabal+2−2 src/Hakyll/Check.hs+1−2 src/Hakyll/Main.hs+2−1

hakyll.cabal+2−2

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

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

181181 vector >= 0.11 && < 0.12,

182182 yaml >= 0.8 && < 0.9,

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

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

184184

185185 If flag(previewServer)

186186 Build-depends:

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

207207

208208 If flag(checkExternal)

209209 Build-depends:

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

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

211211 http-types >= 0.7 && < 0.10

212212 Cpp-options:

213213 -DCHECK_EXTERNAL

src/Hakyll/Check.hs+1−2

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

236236

237237 -- Convert exception to a concise form

238238 showException e = case cast e of

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

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

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

241240 _ -> head $ words $ show e

242241#else

243242checkExternalUrl _ = return ()

src/Hakyll/Main.hs+2−1

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

1616

1717

1818--------------------------------------------------------------------------------

19−import Options.Applicative

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

20+import Options.Applicative

2021

2122

2223--------------------------------------------------------------------------------