diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2021-10-22 17:31:40 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2021-10-22 17:31:40 -0700 |
| commit | 45054733fa3bd9c3ce349018854be61b91b5a804 (patch) | |
| tree | 8b38dd52a9a996b350387e51242b1cb16077ee27 | |
| parent | ce1aca4a322c91a76d4bf5e4b93d48184d0a54a0 (diff) | |
| download | pandoc-45054733fa3bd9c3ce349018854be61b91b5a804.tar.gz | |
Use citeproc 0.6, commonmark 0.2.2.1, commonmark-extensions 0.2.2
| -rw-r--r-- | cabal.project | 17 | ||||
| -rw-r--r-- | pandoc.cabal | 6 | ||||
| -rw-r--r-- | stack.yaml | 8 |
3 files changed, 6 insertions, 25 deletions
diff --git a/cabal.project b/cabal.project index 28d7693c4..4dacd344c 100644 --- a/cabal.project +++ b/cabal.project @@ -3,23 +3,6 @@ tests: True flags: +embed_data_files -- constraints: aeson >= 2.0.1.0 -source-repository-package - type: git - location: https://github.com/jgm/citeproc.git - tag: 673a7fb643d24a3bb0f60f8f29e189c0ba7ef15b - -source-repository-package - type: git - location: https://github.com/jgm/commonmark-hs.git - tag: 7d34a747cd2d8668451909a722eb9ce16d1f4852 - subdir: commonmark - -source-repository-package - type: git - location: https://github.com/jgm/commonmark-hs.git - tag: 7d34a747cd2d8668451909a722eb9ce16d1f4852 - subdir: commonmark-pandoc - -- Needed to build with aeson 2 -- source-repository-package diff --git a/pandoc.cabal b/pandoc.cabal index 17bfb6b5a..d220980fd 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -535,9 +535,9 @@ library blaze-markup >= 0.8 && < 0.9, bytestring >= 0.9 && < 0.12, case-insensitive >= 1.2 && < 1.3, - citeproc >= 0.5 && < 0.6, - commonmark >= 0.2.1 && < 0.3, - commonmark-extensions >= 0.2.1.2 && < 0.3, + citeproc >= 0.6 && < 0.7, + commonmark >= 0.2.1.1 && < 0.3, + commonmark-extensions >= 0.2.2 && < 0.3, commonmark-pandoc >= 0.2.1.1 && < 0.3, connection >= 0.3.1, containers >= 0.4.2.1 && < 0.7, diff --git a/stack.yaml b/stack.yaml index 3a01d5b88..f46485335 100644 --- a/stack.yaml +++ b/stack.yaml @@ -27,11 +27,9 @@ extra-deps: - tasty-lua-1.0.0 - pandoc-types-1.22.1 - texmath-0.12.3.2 -- git: https://github.com/jgm/citeproc.git - commit: 673a7fb643d24a3bb0f60f8f29e189c0ba7ef15b -- git: https://github.com/jgm/commonmark-hs.git - commit: 7d34a747cd2d8668451909a722eb9ce16d1f4852 - subdirs: [commonmark, commonmark-pandoc] +- commonmark-0.2.1.1 +- commonmark-extensions-0.2.2 +- citeproc-0.6 ghc-options: "$locals": -fhide-source-paths -Wno-missing-home-modules resolver: lts-18.10 |