From d523eca3d3d1387d477e48c5269f59800ac3281d Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 11 Mar 2022 10:23:06 -0800 Subject: [PATCH] Use dev version of pandoc-types. This allows toJSONFilter to work with Meta and MetaValue. --- cabal.project | 5 +++++ pandoc.cabal | 4 ++-- stack.yaml | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cabal.project b/cabal.project index 0e79c1daa..e94433879 100644 --- a/cabal.project +++ b/cabal.project @@ -13,6 +13,11 @@ source-repository-package location: https://github.com/jgm/citeproc.git tag: 32fcf268d8bac2825eddd3c51a9112112e5eaadb +source-repository-package + type: git + location: https://github.com/jgm/pandoc-types.git + tag: feb3a90a17334ab314f63b2de3ec0c7dd59b4be0 + source-repository-package type: git location: https://github.com/jgm/commonmark-hs.git diff --git a/pandoc.cabal b/pandoc.cabal index e5b0b6e5e..4269eadac 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -501,7 +501,7 @@ library network >= 2.6, network-uri >= 2.6 && < 2.8, pandoc-lua-marshal >= 0.1.5 && < 0.2, - pandoc-types >= 1.22.1 && < 1.23, + pandoc-types >= 1.22.2 && < 1.23, parsec >= 3.1 && < 3.2, pretty >= 1.1 && < 1.2, pretty-show >= 1.10 && < 1.11, @@ -800,7 +800,7 @@ test-suite test-pandoc filepath >= 1.1 && < 1.5, hslua >= 2.1 && < 2.3, mtl >= 2.2 && < 2.3, - pandoc-types >= 1.22.1 && < 1.23, + pandoc-types >= 1.22.2 && < 1.23, process >= 1.2.3 && < 1.7, tasty >= 0.11 && < 1.5, tasty-golden >= 2.3 && < 2.4, diff --git a/stack.yaml b/stack.yaml index 441029aaa..e6b8a0eef 100644 --- a/stack.yaml +++ b/stack.yaml @@ -30,7 +30,6 @@ extra-deps: - tasty-hslua-1.0.2 - tasty-lua-1.0.2 - pandoc-lua-marshal-0.1.5.1 -- pandoc-types-1.22.1 - aeson-pretty-0.8.9 - unicode-transforms-0.4.0@rev:1 - unicode-data-0.3.0 @@ -43,6 +42,8 @@ extra-deps: subdirs: [commonmark, commonmark-extensions] - git: https://github.com/jgm/texmath.git commit: 31438be6166497425039d7f2ac29b13ad6792387 +- git: https://github.com/jgm/pandoc-types.git + commit: feb3a90a17334ab314f63b2de3ec0c7dd59b4be0 ghc-options: "$locals": -fhide-source-paths -Wno-missing-home-modules resolver: lts-18.10