diff options
| author | John MacFarlane <[email protected]> | 2023-01-13 10:42:07 -0800 |
|---|---|---|
| committer | John MacFarlane <[email protected]> | 2023-01-13 10:42:07 -0800 |
| commit | aa747f194fbcff10adbd0f3ad0f368cee6b1022a (patch) | |
| tree | a7230c853ad17f92699f8eb845142268d990dbe9 | |
| parent | 2d72e968e314d899898fb5d06279ef1ac167f250 (diff) | |
Require pandoc-types 1.23, update dependencies.
This fails to build because pandoc-lua-marshal still needs updating.
| -rw-r--r-- | cabal.project | 12 | ||||
| -rw-r--r-- | pandoc-lua-engine/pandoc-lua-engine.cabal | 4 | ||||
| -rw-r--r-- | pandoc-server/pandoc-server.cabal | 2 | ||||
| -rw-r--r-- | pandoc.cabal | 4 | ||||
| -rw-r--r-- | stack.yaml | 10 |
5 files changed, 21 insertions, 11 deletions
diff --git a/cabal.project b/cabal.project index a2e9b4ecd..16fe361a4 100644 --- a/cabal.project +++ b/cabal.project @@ -10,17 +10,23 @@ constraints: skylighting-format-blaze-html >= 0.1.1, source-repository-package type: git location: https://github.com/jgm/citeproc - tag: 4099185c5a82ef1f84b711c113d2744eeb794106 + tag: a73c7d1c00c993b8a20daf5a932afae16f889c83 source-repository-package type: git location: https://github.com/jgm/texmath - tag: 1a77db688bd3285228299e5aeefc93d6c0d8c0b9 + tag: dab2be16b751e8ce7e6d9937029f10e06c3c80c3 + +source-repository-package + type: git + location: https://github.com/jgm/commonmark-hs + tag: d0f3097e55471aa640d76d0188ba707cbece71b1 + subdir: commonmark-pandoc source-repository-package type: git location: https://github.com/jgm/pandoc-types - tag: 183af9d9f1066be974ac55fd23a4c985999d3ce8 + tag: 6ac717718396bdca510cbdc6d211bbea408444cc source-repository-package type: git diff --git a/pandoc-lua-engine/pandoc-lua-engine.cabal b/pandoc-lua-engine/pandoc-lua-engine.cabal index 0f27907fb..d7df259fc 100644 --- a/pandoc-lua-engine/pandoc-lua-engine.cabal +++ b/pandoc-lua-engine/pandoc-lua-engine.cabal @@ -113,7 +113,7 @@ library , mtl >= 2.2 && < 2.4 , pandoc >= 3.0 && < 3.1 , pandoc-lua-marshal >= 0.1.7 && < 0.2 - , pandoc-types >= 1.22.2 && < 1.23 + , pandoc-types >= 1.22 && < 1.24 , parsec >= 3.1 && < 3.2 , text >= 1.1.1 && < 2.1 @@ -131,7 +131,7 @@ test-suite test-pandoc-lua-engine , filepath , hslua >= 2.1 && < 2.3 , pandoc - , pandoc-types >= 1.22.2 && < 1.23 + , pandoc-types >= 1.22 && < 1.24 , tasty , tasty-golden , tasty-hunit diff --git a/pandoc-server/pandoc-server.cabal b/pandoc-server/pandoc-server.cabal index 5779d1413..66ecf0624 100644 --- a/pandoc-server/pandoc-server.cabal +++ b/pandoc-server/pandoc-server.cabal @@ -50,7 +50,7 @@ common common-executable library import: common-options build-depends: pandoc >= 3.0, - pandoc-types >= 1.22.2 && < 1.23, + pandoc-types >= 1.22 && < 1.24, containers >= 0.6.0.1 && < 0.7, aeson >= 2.0 && < 2.2, bytestring >= 0.9 && < 0.12, diff --git a/pandoc.cabal b/pandoc.cabal index 03dbd6ac7..e75f6bd1f 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -500,7 +500,7 @@ library mtl >= 2.2 && < 2.4, network >= 2.6, network-uri >= 2.6 && < 2.8, - pandoc-types >= 1.22.2 && < 1.23, + pandoc-types >= 1.23 && < 1.24, parsec >= 3.1 && < 3.2, pretty >= 1.1 && < 1.2, pretty-show >= 1.10 && < 1.11, @@ -754,7 +754,7 @@ test-suite test-pandoc doctemplates >= 0.11 && < 0.12, filepath >= 1.1 && < 1.5, mtl >= 2.2 && < 2.4, - pandoc-types >= 1.22.2 && < 1.23, + pandoc-types >= 1.23 && < 1.24, 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 6a4fe3d84..fa5344236 100644 --- a/stack.yaml +++ b/stack.yaml @@ -25,13 +25,17 @@ extra-deps: - doctemplates-0.11 - commonmark-extensions-0.2.3.3 - git: https://github.com/jgm/texmath - commit: 1a77db688bd3285228299e5aeefc93d6c0d8c0b9 + commit: dab2be16b751e8ce7e6d9937029f10e06c3c80c3 - git: https://github.com/jgm/citeproc - commit: 4099185c5a82ef1f84b711c113d2744eeb794106 + commit: a73c7d1c00c993b8a20daf5a932afae16f889c83 - git: https://github.com/jgm/pandoc-types - commit: 183af9d9f1066be974ac55fd23a4c985999d3ce8 + commit: 6ac717718396bdca510cbdc6d211bbea408444cc - git: https://github.com/pandoc/pandoc-lua-marshal commit: a2a97e2af78326ea7841101d4ef56e74426b66c4 +- git: https://github.com/jgm/commonmark-hs + commit: d0f3097e55471aa640d76d0188ba707cbece71b1 + subdirs: [commonmark-pandoc] + ghc-options: "$locals": -fhide-source-paths -Wno-missing-home-modules resolver: lts-20.6 |