4616838 · hakyll · git.iko.soy

git.iko.soy/hakyll

Merge branch 'master' into dev-provider-rewrite

commit46168382f170b4559ce266b8257b7b7988589ed1 authorJasper Van der Jeugt <m@jaspervdj.be> dateSun 10 Feb 2013, 21:51 (14 years ago) parent86d0b68 e93753d

2 files changed+5−4

compare with master

unifiedsplit

hakyll.cabal+2−2 web/tutorials/01-installation.markdown+3−2

hakyll.cabal+2−2

@@ -95,7 +95,7 @@ Library

9595 directory >= 1.0 && < 1.3,

9696 filepath >= 1.0 && < 1.4,

9797 http-conduit >= 1.8 && < 1.9,

98− http-types >= 0.7 && < 0.8,

98+ http-types >= 0.7 && < 0.9,

9999 lrucache >= 1.1.1 && < 1.2,

100100 mtl >= 1 && < 2.2,

101101 old-locale >= 1.0 && < 1.1,

@@ -193,7 +193,7 @@ Test-suite hakyll-tests

193193 directory >= 1.0 && < 1.3,

194194 filepath >= 1.0 && < 1.4,

195195 http-conduit >= 1.8 && < 1.9,

196− http-types >= 0.7 && < 0.8,

196+ http-types >= 0.7 && < 0.9,

197197 lrucache >= 1.1.1 && < 1.2,

198198 mtl >= 1 && < 2.2,

199199 old-locale >= 1.0 && < 1.1,

web/tutorials/01-installation.markdown+3−2

@@ -32,8 +32,9 @@ started:

3232

3333 $ hakyll-init my-site

3434

35−If `hakyll-init` is not found, you should make sure `$HOME/.cabal/bin` is in

36−your `$PATH`.

35+This creates a folder `my-site` in the current directory, with some example

36+content and a generic configuration. If `hakyll-init` is not found, you should

37+make sure `$HOME/.cabal/bin` is in your `$PATH`.

3738

3839The file `site.hs` holds the configuration of your site, as an executable

3940haskell program. We can compile and run it like this: