From 16b64bda3821a47fc6b3a215f5a74db00a892b4e Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 25 Apr 2021 21:56:54 -0700 Subject: Use dev texmath, citeproc. --- cabal.project | 6 +++++- pandoc.cabal | 2 +- stack.yaml | 8 +++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/cabal.project b/cabal.project index 2b82eb70c..fa4d9353a 100644 --- a/cabal.project +++ b/cabal.project @@ -5,5 +5,9 @@ flags: +embed_data_files source-repository-package type: git location: https://github.com/jgm/citeproc - tag: 46066cb8939e907e7e3a7126304919c8ed32aed0 + tag: f33b370bd1ab5ad5140720369c0586041e433a47 +source-repository-package +- type: git + location: https://github.com/jm/texmath + tag: 0c34bb7d229389adc62bcbfe20cfbfdc0c8ccc8d diff --git a/pandoc.cabal b/pandoc.cabal index 14d2da0ae..29a5bfc7a 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -445,7 +445,7 @@ library blaze-markup >= 0.8 && < 0.9, bytestring >= 0.9 && < 0.12, case-insensitive >= 1.2 && < 1.3, - citeproc >= 0.3.0.9 && < 0.3.1, + citeproc >= 0.4 && < 0.4.1, commonmark >= 0.1.1.3 && < 0.2, commonmark-extensions >= 0.2.0.4 && < 0.3, commonmark-pandoc >= 0.2 && < 0.3, diff --git a/stack.yaml b/stack.yaml index b3e29ba93..32369895f 100644 --- a/stack.yaml +++ b/stack.yaml @@ -13,13 +13,15 @@ extra-deps: - skylighting-core-0.10.5.1 - skylighting-0.10.5.1 - doclayout-0.3.0.2 -- texmath-0.12.2 - random-1.2.0 - xml-conduit-1.9.1.1 -- unicode-collation-0.1.2 +- unicode-collation-0.1.3 +# - texmath-0.12.2 +- git: https://github.com/jgm/texmath + commit: 0c34bb7d229389adc62bcbfe20cfbfdc0c8ccc8d # - citeproc-0.3.0.9 - git: https://github.com/jgm/citeproc - commit: 46066cb8939e907e7e3a7126304919c8ed32aed0 + commit: f33b370bd1ab5ad5140720369c0586041e433a47 ghc-options: "$locals": -fhide-source-paths -Wno-missing-home-modules resolver: lts-17.5 -- cgit v1.2.3