From c28c16d46311f3642d3263869dc676a481ef14ed Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 2 Oct 2016 12:29:37 +0200 Subject: Use doctemplates 0.1.0.2. --- deb/stack.yaml | 2 +- osx/stack.yaml | 2 +- pandoc.cabal | 6 +++--- stack.full.yaml | 9 +++++---- stack.lts6.yaml | 2 +- stack.yaml | 2 +- windows/stack.yaml | 2 +- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/deb/stack.yaml b/deb/stack.yaml index 85e397d80..4a777d4ef 100644 --- a/deb/stack.yaml +++ b/deb/stack.yaml @@ -15,7 +15,7 @@ packages: - '..' extra-deps: - pandoc-citeproc-0.10.1.1 -- doctemplates-0.1.0.1 +- doctemplates-0.1.0.2 - http-client-0.5.0 - http-client-tls-0.3.0 resolver: lts-7.0 diff --git a/osx/stack.yaml b/osx/stack.yaml index 13d786f88..82c5bea7b 100644 --- a/osx/stack.yaml +++ b/osx/stack.yaml @@ -18,7 +18,7 @@ packages: - '..' extra-deps: - pandoc-citeproc-0.10.1.1 -- doctemplates-0.1.0.1 +- doctemplates-0.1.0.2 - 'http-client-0.5.0' - 'http-client-tls-0.3.0' resolver: lts-7.0 diff --git a/pandoc.cabal b/pandoc.cabal index a91c9d02a..0523fdb20 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -267,7 +267,7 @@ Library xml >= 1.3.12 && < 1.4, random >= 1 && < 1.2, extensible-exceptions >= 0.1 && < 0.2, - pandoc-types >= 1.16 && < 1.17, + pandoc-types >= 1.17 && < 1.18, aeson >= 0.7 && < 1.1, tagsoup >= 0.13.7 && < 0.15, base64-bytestring >= 0.1 && < 1.1, @@ -422,7 +422,7 @@ Library Executable pandoc Build-Depends: pandoc, - pandoc-types >= 1.16 && < 1.17, + pandoc-types >= 1.17 && < 1.18, base >= 4.2 && <5, directory >= 1.2 && < 1.3, filepath >= 1.1 && < 1.5, @@ -479,7 +479,7 @@ Test-Suite test-pandoc Build-Depends: base >= 4.2 && < 5, syb >= 0.1 && < 0.7, pandoc, - pandoc-types >= 1.16 && < 1.17, + pandoc-types >= 1.17 && < 1.18, bytestring >= 0.9 && < 0.11, text >= 0.11 && < 1.3, directory >= 1 && < 1.3, diff --git a/stack.full.yaml b/stack.full.yaml index 8ef2a0abd..4be19b9b6 100644 --- a/stack.full.yaml +++ b/stack.full.yaml @@ -12,15 +12,16 @@ flags: embed_data_files: true # if you are on OSX, stack install cpphs and # uncomment the following three lines: -#ghc-options: -# pandoc-citeproc: '-pgmP cpphs -optP--cpp' -# highlighting-kate: '-pgmP cpphs -optP--cpp' +ghc-options: + pandoc-citeproc: '-pgmP cpphs -optP--cpp' + highlighting-kate: '-pgmP cpphs -optP--cpp' packages: - '.' - '../pandoc-citeproc' - '../pandoc-types' +- '../texmath' extra-deps: -- doctemplates-0.1.0.1 +- doctemplates-0.1.0.2 - http-client-0.5.0 - http-client-tls-0.3.0 resolver: lts-7.0 diff --git a/stack.lts6.yaml b/stack.lts6.yaml index 755ff52e4..7b497479e 100644 --- a/stack.lts6.yaml +++ b/stack.lts6.yaml @@ -11,6 +11,6 @@ extra-deps: - data-default-0.6.0 - http-client-0.5.0 - http-client-tls-0.3.0 -- doctemplates-0.1.0.1 +- doctemplates-0.1.0.2 - cmark-0.5.3.1 resolver: lts-6.5 diff --git a/stack.yaml b/stack.yaml index 34b2b84da..8514454ff 100644 --- a/stack.yaml +++ b/stack.yaml @@ -10,5 +10,5 @@ packages: extra-deps: - http-client-0.5.0 - http-client-tls-0.3.0 -- doctemplates-0.1.0.1 +- doctemplates-0.1.0.2 resolver: lts-7.0 diff --git a/windows/stack.yaml b/windows/stack.yaml index 9a3b04b89..7f57323cf 100644 --- a/windows/stack.yaml +++ b/windows/stack.yaml @@ -17,5 +17,5 @@ extra-deps: - 'http-client-0.5.0' - 'http-client-tls-0.3.0' - pandoc-citeproc-0.10.1.1 -- doctemplates-0.1.0.1 +- doctemplates-0.1.0.2 resolver: lts-7.0 -- cgit v1.2.3