git.iko.soy/hakyll
on master help sign in
Merge branch 'master' into dev-provider-rewrite
4616838Jasper Van der Jeugt
hakyll.cabal+2−2
compare with master
unifiedsplit
@@ -95,7 +95,7 @@ Library
95 directory >= 1.0 && < 1.3,
95 directory >= 1.0 && < 1.3,
96 filepath >= 1.0 && < 1.4,
96 filepath >= 1.0 && < 1.4,
97 http-conduit >= 1.8 && < 1.9,
97 http-conduit >= 1.8 && < 1.9,
98− http-types >= 0.7 && < 0.8,
98+ http-types >= 0.7 && < 0.9,
99 lrucache >= 1.1.1 && < 1.2,
99 lrucache >= 1.1.1 && < 1.2,
100 mtl >= 1 && < 2.2,
100 mtl >= 1 && < 2.2,
101 old-locale >= 1.0 && < 1.1,
101 old-locale >= 1.0 && < 1.1,
@@ -193,7 +193,7 @@ Test-suite hakyll-tests
193 directory >= 1.0 && < 1.3,
193 directory >= 1.0 && < 1.3,
194 filepath >= 1.0 && < 1.4,
194 filepath >= 1.0 && < 1.4,
195 http-conduit >= 1.8 && < 1.9,
195 http-conduit >= 1.8 && < 1.9,
196− http-types >= 0.7 && < 0.8,
196+ http-types >= 0.7 && < 0.9,
197 lrucache >= 1.1.1 && < 1.2,
197 lrucache >= 1.1.1 && < 1.2,
198 mtl >= 1 && < 2.2,
198 mtl >= 1 && < 2.2,
199 old-locale >= 1.0 && < 1.1,
199 old-locale >= 1.0 && < 1.1,
web/tutorials/01-installation.markdown+3−2
@@ -32,8 +32,9 @@ started:
32
32
33 $ hakyll-init my-site
33 $ hakyll-init my-site
34
34
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
35−If `hakyll-init` is not found, you should make sure `$HOME/.cabal/bin` is in
37+make sure `$HOME/.cabal/bin` is in your `$PATH`.
36−your `$PATH`.
37
38
38The file `site.hs` holds the configuration of your site, as an executable
39The file `site.hs` holds the configuration of your site, as an executable
39haskell program. We can compile and run it like this:
40haskell program. We can compile and run it like this: