From a416a2f243ae54ee52115f55f573f32012d4c442 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Tue, 11 Jan 2022 23:52:57 -0800 Subject: [PATCH] Use citeproc 0.6.0.1. --- cabal.project | 22 ---------------------- pandoc.cabal | 2 +- stack.yaml | 15 ++++----------- 3 files changed, 5 insertions(+), 34 deletions(-) diff --git a/cabal.project b/cabal.project index 7e4d854b3..779ffcfa7 100644 --- a/cabal.project +++ b/cabal.project @@ -3,30 +3,8 @@ tests: True flags: +embed_data_files constraints: aeson >= 2.0.1.0 -source-repository-package - type: git - location: https://github.com/jgm/commonmark-hs - tag: 530c6d93c9d7f84b1d71e10d23c1bfaee82e86bd - subdir: commonmark-pandoc - -source-repository-package - type: git - location: https://github.com/jgm/commonmark-hs - tag: 530c6d93c9d7f84b1d71e10d23c1bfaee82e86bd - subdir: commonmark-extensions - -source-repository-package - type: git - location: https://github.com/jgm/commonmark-hs - tag: 530c6d93c9d7f84b1d71e10d23c1bfaee82e86bd - subdir: commonmark - source-repository-package type: git location: https://github.com/jgm/ipynb.git tag: 00246af10885c2ad4413ace4f69a7e6c88297a08 -source-repository-package - type: git - location: https://github.com/jgm/citeproc.git - tag: 81f8a77b7378f3e7305fb0ea1554e9a4726d4ade diff --git a/pandoc.cabal b/pandoc.cabal index 3f6b6cdab..b1e90e28f 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -459,7 +459,7 @@ library blaze-markup >= 0.8 && < 0.9, bytestring >= 0.9 && < 0.12, case-insensitive >= 1.2 && < 1.3, - citeproc >= 0.6 && < 0.7, + citeproc >= 0.6.0.1 && < 0.7, commonmark >= 0.2.1.1 && < 0.3, commonmark-extensions >= 0.2.2 && < 0.3, commonmark-pandoc >= 0.2.1.1 && < 0.3, diff --git a/stack.yaml b/stack.yaml index 97cd0c706..c235578e8 100644 --- a/stack.yaml +++ b/stack.yaml @@ -33,19 +33,12 @@ extra-deps: - unicode-transforms-0.4.0 - unicode-data-0.2.0 - texmath-0.12.4 +- commonmark-0.2.1.1 +- commonmark-extensions-0.2.2.1 +- commonmark-pandoc-0.2.1.1 +- citeproc-0.6.0.1 - git: https://github.com/jgm/ipynb.git commit: 00246af10885c2ad4413ace4f69a7e6c88297a08 -- git: https://github.com/jgm/citeproc.git - commit: 81f8a77b7378f3e7305fb0ea1554e9a4726d4ade -- git: https://github.com/jgm/commonmark-hs - commit: 530c6d93c9d7f84b1d71e10d23c1bfaee82e86bd - subdir: commonmark -- git: https://github.com/jgm/commonmark-hs - commit: 530c6d93c9d7f84b1d71e10d23c1bfaee82e86bd - subdir: commonmark-pandoc -- git: https://github.com/jgm/commonmark-hs - commit: 530c6d93c9d7f84b1d71e10d23c1bfaee82e86bd - subdir: commonmark-extensions ghc-options: "$locals": -fhide-source-paths -Wno-missing-home-modules resolver: lts-18.10