From 168b559c96f409234efe811cf556c931feb7b847 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 18 Jul 2021 10:55:27 -0700 Subject: Use doctemplates 0.4.1 and citeproc 0.10. --- cabal.project | 13 ++++--------- pandoc.cabal | 4 ++-- stack.yaml | 6 ++---- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/cabal.project b/cabal.project index e18577471..00e3adcc2 100644 --- a/cabal.project +++ b/cabal.project @@ -2,12 +2,7 @@ packages: pandoc.cabal tests: True flags: +embed_data_files -source-repository-package - type: git - location: https://github.com/jgm/doctemplates - tag: 428c26d5303cf7a2b1051fe1ffd9aafe9ba71c81 - -source-repository-package - type: git - location: https://github.com/jgm/citeproc - tag: 4ce0501cd6f9c86eee087afcf878c256e49b9615 +#source-repository-package +# type: git +# location: https://github.com/jgm/citeproc +# tag: 4ce0501cd6f9c86eee087afcf878c256e49b9615 diff --git a/pandoc.cabal b/pandoc.cabal index 0abfddde8..999f00f11 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -451,7 +451,7 @@ library blaze-markup >= 0.8 && < 0.9, bytestring >= 0.9 && < 0.12, case-insensitive >= 1.2 && < 1.3, - citeproc >= 0.4.0.1 && < 0.4.1, + citeproc >= 0.4.1 && < 0.4.2, commonmark >= 0.2.1 && < 0.3, commonmark-extensions >= 0.2.1.2 && < 0.3, commonmark-pandoc >= 0.2.1.1 && < 0.3, @@ -461,7 +461,7 @@ library deepseq >= 1.3 && < 1.5, directory >= 1.2.3 && < 1.4, doclayout >= 0.3.0.1 && < 0.4, - doctemplates >= 0.9 && < 0.10, + doctemplates >= 0.10 && < 0.11, emojis >= 0.1 && < 0.2, exceptions >= 0.8 && < 0.11, file-embed >= 0.0 && < 0.1, diff --git a/stack.yaml b/stack.yaml index b948f9990..8e52a819f 100644 --- a/stack.yaml +++ b/stack.yaml @@ -11,10 +11,8 @@ extra-deps: - commonmark-pandoc-0.2.1.1 - skylighting-core-0.11 - skylighting-0.11 -- git: https://github.com/jgm/doctemplates - commit: 428c26d5303cf7a2b1051fe1ffd9aafe9ba71c81 -- git: https://github.com/jgm/citeproc - commit: 4ce0501cd6f9c86eee087afcf878c256e49b9615 +- doctemplates-0.10 +- citeproc-0.4.1 ghc-options: "$locals": -fhide-source-paths -Wno-missing-home-modules resolver: lts-18.0 -- cgit v1.2.3