diff options
| -rw-r--r-- | hakyll.cabal | 2 | ||||
| -rw-r--r-- | web/examples.markdown | 6 | ||||
| -rw-r--r-- | web/tutorials/github-pages-tutorial.md | 12 |
3 files changed, 14 insertions, 6 deletions
diff --git a/hakyll.cabal b/hakyll.cabal index ba99d5f..28f5492 100644 --- a/hakyll.cabal +++ b/hakyll.cabal @@ -269,7 +269,7 @@ Test-suite hakyll-tests time-locale-compat >= 0.1 && < 0.2, unordered-containers >= 0.2 && < 0.3, vector >= 0.11 && < 0.12, - yaml >= 0.8 && < 0.9, + yaml >= 0.8.11 && < 0.9, optparse-applicative >= 0.12 && < 0.13 If flag(previewServer) diff --git a/web/examples.markdown b/web/examples.markdown index cbcab55..9e33345 100644 --- a/web/examples.markdown +++ b/web/examples.markdown @@ -66,8 +66,6 @@ directly with the default Hakyll site. [literate source](http://scr.stunts.hu/hakyll.html) - <http://www.eanalytica.com/>, [literate source](http://www.eanalytica.com/site/) -- <http://dikmax.name/>, - [source](https://github.com/dikmax/dikmax.name) - <http://cse.iitk.ac.in/users/ppk>, [source](https://github.com/piyush-kurur-pages/website) - <http://web.engr.oregonstate.edu/~walkiner/>, @@ -158,6 +156,10 @@ directly with the default Hakyll site. [source](https://github.com/klpn/static-dust) - <http://www.kuznero.com/>, [source](https://github.com/kuznero/kuznero.github.io) +- <http://nicolerauch.de/>, + [source](https://github.com/NicoleRauch/BusinessWebsite) +- <http://johnduhamel.io/>, + [source](https://github.com/jjduhamel/blog) ## Hakyll 3.X diff --git a/web/tutorials/github-pages-tutorial.md b/web/tutorials/github-pages-tutorial.md index 67410bd..7681353 100644 --- a/web/tutorials/github-pages-tutorial.md +++ b/web/tutorials/github-pages-tutorial.md @@ -86,7 +86,7 @@ stack exec myblog build Update the local list of remote branches to ensure we're able to checkout the branch we want in the next step. ``` -git fetch -all +git fetch --all ``` Switch to the `master` branch. @@ -142,7 +142,7 @@ stack exec myblog clean stack exec myblog build # Get previous files -git fetch -all +git fetch --all git checkout -b master --track origin/master # Overwrite existing files with new files @@ -168,7 +168,13 @@ git stash pop Earlier it was mentioned a flaw is that deleted files will persist in the published site until deleted manually. This is easily overcome by using `rsync` instead of `cp`. ``` -rsync -a --filter='P _site/' --filter='P _cache/' --filter='P .git/' --filter='P .gitignore' --delete-excluded _site/ . +rsync -a --filter='P _site/' \ + --filter='P _cache/' \ + --filter='P .git/' \ + --filter='P .gitignore' \ + --filter='P .stack-work' \ + --delete-excluded \ + _site/ . ``` The only drawback this approach has is the requirement that *every* file in your site "go through" Hakyll. Fortunately, in many cases this is not an issue. |