@@ -6,17 +6,13 @@ author: Jasper Van der Jeugt
66Installation
77------------
88
9−Installation is provided using [cabal], and some packages are available for
10−different distributions.
9+Installation is provided via Hackage, and some packages are available for
10+different distributions. For installation from source (i.e. via Hackage),
11+[stack] is recommended:
1112
12− $ cabal install hakyll
13+ $ stack install hakyll
1314
14−[cabal]: http://www.haskell.org/cabal/
15−
16−If you have a recent installation of `cabal` and your time is somewhat valuable,
17−use:
18−
19− $ cabal install -j hakyll
15+[stack]: http://www.haskellstack.org/
2016
2117Linux distro packages:
2218
@@ -34,27 +30,21 @@ started:
3430This creates a folder `my-site` in the current directory, with some example
3531content and a generic configuration.
3632
37−If `hakyll-init` is not found, you should make sure `$HOME/.cabal/bin` is in
38−your `$PATH`.
39−
40−(If you're on OS X you may not have a bin directory in `$HOME/.cabal`. In this
41−case, check `$HOME/Library/Haskell/bin` and put it on your path if you find
42−`hakyll-init` there. See [here] for more information on installation paths on
43−OS X.)
44−
45−[here]: http://www.haskell.org/haskellwiki/Mac_OS_X_Common_Installation_Paths
33+If `hakyll-init` is not found, you should make sure your stack bin path
34+(usually `$HOME/.local/bin`) is in your `$PATH`. You can check your stack local
35+bin path by running `stack path --local-bin-path`.
4636
4737The file `site.hs` holds the configuration of your site, as an executable
4838haskell program. We can compile and run it like this:
4939
5040 $ cd my-site
51− $ ghc --make -threaded site.hs
52− $ ./site build
41+ $ stack build
42+ $ stack exec site build
5343
5444If you installed `hakyll` with a preview server (this is the default), you can
5545now use
5646
57− $ ./site watch
47+ $ stack exec site watch
5848
5949and have a look at your site at
6050[http://localhost:8000/](http://localhost:8000/).