Commit graph

1602 commits

Author SHA1 Message Date
Lorenzo
871cfd36dd Include file name in error messages 2016-07-23 12:31:03 +02:00
Lorenzo
7a1989d288 Merge remote-tracking branch 'upstream/master' 2016-07-22 17:02:04 +02:00
Lorenzo
3d713e9f2c Fail if template is not parsed until eof
This should fix the second problem in #376.
2016-07-22 16:37:18 +02:00
Jasper Van der Jeugt
cb07202f5a Merge pull request #447 from Arguggi/master
Switch preview server from Snap to Warp
2016-07-22 13:12:25 +02:00
Arguggi
1e7e78f2e8 Fix test dependencies 2016-07-22 13:01:18 +02:00
Arguggi
c4216c15fc Switch preview server from Snap to Warp 2016-07-22 12:43:14 +02:00
Jasper Van der Jeugt
9b8a225718 Merge pull request #446 from lucamolteni/master
Fixes https://github.com/jaspervdj/hakyll/issues/323
2016-07-22 12:39:54 +02:00
Luca Molteni
c0a4f3f055 Fixes https://github.com/jaspervdj/hakyll/issues/323 we have less compression but we preserve correct CSS semantic 2016-07-22 12:10:07 +02:00
Jasper Van der Jeugt
72d2b11efe Remove include macro from .ghci 2016-07-22 11:38:20 +02:00
Jasper Van der Jeugt
ab48976880 Merge pull request #445 from ethagnawl/444-port-default.html-to-html5
#444 - porting default.html from XHTML to HTML5
2016-07-13 17:05:03 +02:00
Peter Doherty
ac7d7220aa #444 - group viewport meta tag with other meta tags 2016-07-13 10:51:24 -04:00
Jasper Van der Jeugt
40bdac73b8 Add www.kuznero.com to examples 2016-07-13 14:28:43 +02:00
Peter Doherty
78329b24d8 #444 - porting default.html to valid html5 2016-07-12 14:18:24 -04:00
Jasper Van der Jeugt
00c7aca797 Add static-dust.klpn.se to examples 2016-06-29 13:16:13 +02:00
Jasper Van der Jeugt
0963ad0ba4 Merge pull request #441 from Pratyush/rsync-fix
Fix rsync command in GH Pages tutorial
2016-06-28 12:51:22 +02:00
Pratyush Mishra
fd74894342 Fix rsync command in GH Pages tutorial 2016-06-28 12:38:28 +03:00
Jasper Van der Jeugt
6ac190a834 Merge pull request #440 from jtojnar/verbose-check
Make errors in Check less verbose
2016-06-25 23:25:33 +02:00
Jan Tojnar
164a7dc7ee
Make errors in Check less verbose 2016-06-25 23:02:18 +02:00
Jasper Van der Jeugt
6258625c7b Merge pull request #435 from crodjer/pandoc-citeproc
Upgrade `pandoc-citeproc` to 0.10
2016-06-25 13:37:15 +02:00
Jasper Van der Jeugt
58fe3f4ab3 Bump version to 4.8.3.2 2016-06-21 11:20:27 +02:00
Jasper Van der Jeugt
4194752f3d Add nek0.eu to examples 2016-06-21 11:11:49 +02:00
Jasper Van der Jeugt
6a88430ce9 Merge branch 'master' of github.com:jaspervdj/hakyll 2016-06-21 10:59:23 +02:00
Jasper Van der Jeugt
2f5d3522d5 Merge pull request #437 from felixonmars/patch-1
Allow data-default 0.7, pandoc-citeproc 0.10, and tagsoup 0.14
2016-06-21 10:55:39 +02:00
Jasper Van der Jeugt
4bc70b2dd3 Merge pull request #439 from toothbrush/data-default-version
Loosen version restriction on data-default
2016-06-21 10:45:52 +02:00
Paul van der Walt
5c8eb2af52 Loosen version restriction on data-default
* hakyll.cabal (data-default): Allow data-default<0.8, since otherwise
  there's a version conflict when building with GHC8.0.1 and
  Cabal-1.24.0.0.
2016-06-17 13:31:22 +02:00
Jasper Van der Jeugt
56ac26f2a8 Add GH pages & Circle CI external tutorial 2016-06-16 14:01:20 +02:00
Felix Yan
70d6e4cf6e Allow data-default 0.7, pandoc-citeproc 0.10, and tagsoup 0.14
Building with the new release went fine here, and it works correctly.
2016-06-14 07:46:46 -05:00
Rohan Jain
b4fc8d3dcb
Upgrade pandoc-citeproc to 0.10
With previewServer flag disabled, successfully builds with GHC `8.0.1`
and `nightly-2016-06-12` on stack.

Tests pass with the following command:

    stack test --flag hakyll:-previewServer

Signed-off-by: Rohan Jain <crodjer@gmail.com>
2016-06-12 21:39:19 +05:30
Jasper Van der Jeugt
d4d2dadcc3 Merge pull request #432 from sakshamsharma/master
Move to stack for travis CI testing.
2016-06-03 15:41:26 +02:00
Saksham Sharma
6885b8e9fc Move to stack for travis CI testing. 2016-06-02 23:51:26 +02:00
Jasper Van der Jeugt
529ad5314f Merge pull request #430 from sakshamsharma/master
Add new entry to hakyll blog examples
2016-06-02 12:28:51 +02:00
Saksham Sharma
fb17f70a99 Add new entry to hakyll blog examples 2016-05-30 22:41:06 +02:00
Jasper Van der Jeugt
725e5f2d30 Merge pull request #429 from trofi/master
hakyll.cabal: allow binary-0.8, process-1.4, time-1.6 (ghc-8)
2016-05-30 15:18:39 +02:00
Sergei Trofimovich
30b0a4acba hakyll.cabal: allow binary-0.8, process-1.4, time-1.6 (ghc-8)
Signed-off-by: Sergei Trofimovich <siarheit@google.com>
2016-05-29 13:02:11 +01:00
Jasper Van der Jeugt
b1be76da5b Read .metadata files using bytestring 2016-05-17 10:53:11 -04:00
Jasper Van der Jeugt
b6dfc61f75 Bump version to 4.8.3.1 2016-05-16 14:59:58 -04:00
Jasper Van der Jeugt
f884a60d30 Make a not about stack init in the tutorial 2016-05-12 10:26:59 -04:00
Jasper Van der Jeugt
c7a1069658 Bump scientific dependency to 0.3.4
See #426
2016-05-12 10:23:59 -04:00
Jasper Van der Jeugt
8d51bcfe5c Bump version to 4.8.3.0 2016-04-30 01:46:40 +02:00
Jasper Van der Jeugt
057670b32e Merge pull request #421 from trofi/no-show
src/Hakyll/Web/Paginate.hs: Fix build failure
2016-04-30 01:43:41 +02:00
Sergei Trofimovich
e13c1f2af9 src/Hakyll/Web/Paginate.hs: Fix build failure
The code tried to generate Show instance for a function.
I don't know where it used to come from but it's not there
anymore. Build fails as:

  [48 of 49] Compiling Hakyll.Web.Paginate ( src/Hakyll/Web/Paginate.hs, dist/build/Hakyll/Web/Paginate.o )

  src/Hakyll/Web/Paginate.hs:40:17:
    No instance for (Show (PageNumber -> Identifier))
      (maybe you haven't applied enough arguments to a function?)
      arising from the second field of ‘Paginate’
        (type ‘PageNumber -> Identifier’)
    Possible fix:
      use a standalone 'deriving instance' declaration,
        so you can specify the instance context yourself
    When deriving the instance for (Show Paginate)

Change drops Show instance as it's not very useful.

Signed-off-by: Sergei Trofimovich <siarheit@google.com>
2016-04-29 09:38:55 +01:00
Jasper Van der Jeugt
216e2f4d07 Bump version to 4.8.2.0 2016-04-28 22:02:20 +02:00
Jasper Van der Jeugt
14dcd1657f Remove Show instance for Tags
Fixes #420
2016-04-28 21:58:07 +02:00
Jasper Van der Jeugt
9da19767c7 Bump version to 4.8.1.0 2016-04-27 12:44:12 +02:00
Jasper Van der Jeugt
314473e21a Import catchIOError from System.IO.Error 2016-04-27 12:42:46 +02:00
Jasper Van der Jeugt
b5e95b61ab Fix import errors on windows 2016-04-26 17:53:00 +02:00
Jasper Van der Jeugt
af16d76d62 Merge branch 'nomeata-patch-1' 2016-04-25 11:58:43 +02:00
Jasper Van der Jeugt
6cb00e2567 Merge branch 'patch-1' of https://github.com/nomeata/hakyll into nomeata-patch-1 2016-04-25 11:58:19 +02:00
Jasper Van der Jeugt
78f212e7ed Merge pull request #417 from raindev/add-raindev-io-example
Add raindev.io to the list of examples
2016-04-25 11:54:08 +02:00
Andrew Barchuk
c5ce4c18d0
Add raindev.io to the list of examples 2016-04-24 23:03:06 +03:00