From aaf9223b78f4be5cc3d5d9dbe1f18511629c1395 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 7 Dec 2024 13:55:11 -0800 Subject: [PATCH] Depend on typst 0.6.1 --- cabal.project | 5 ----- pandoc-lua-engine/pandoc-lua-engine.cabal | 2 +- pandoc-server/pandoc-server.cabal | 2 +- pandoc.cabal | 2 +- stack.yaml | 2 -- 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/cabal.project b/cabal.project index 89d9660ee..3b5172dc5 100644 --- a/cabal.project +++ b/cabal.project @@ -9,11 +9,6 @@ constraints: skylighting-format-blaze-html >= 0.1.1.2, -- for now (commercialhaskell/stackage#7545): data-default-class <= 0.2, data-default <= 0.8 -source-repository-package - type: git - location: https://github.com/jgm/typst-hs.git - tag: 5a50154c958d09c06fd884dcc4519403f7904bc1 - source-repository-package type: git location: https://github.com/jgm/commonmark-hs.git diff --git a/pandoc-lua-engine/pandoc-lua-engine.cabal b/pandoc-lua-engine/pandoc-lua-engine.cabal index 50f730bc8..913cfaa03 100644 --- a/pandoc-lua-engine/pandoc-lua-engine.cabal +++ b/pandoc-lua-engine/pandoc-lua-engine.cabal @@ -124,7 +124,7 @@ library , hslua-repl >= 0.1.1 && < 0.2 , lpeg >= 1.1 && < 1.2 , mtl >= 2.2 && < 2.4 - , pandoc >= 3.5 && < 3.6 + , pandoc >= 3.6 && < 3.7 , pandoc-lua-marshal >= 0.3 && < 0.4 , pandoc-types >= 1.22 && < 1.24 , parsec >= 3.1 && < 3.2 diff --git a/pandoc-server/pandoc-server.cabal b/pandoc-server/pandoc-server.cabal index dd0a70ce4..377ff9fc5 100644 --- a/pandoc-server/pandoc-server.cabal +++ b/pandoc-server/pandoc-server.cabal @@ -49,7 +49,7 @@ common common-executable library import: common-options - build-depends: pandoc >= 3.5 && < 3.6, + build-depends: pandoc >= 3.5 && < 3.7, pandoc-types >= 1.22 && < 1.24, containers >= 0.6.0.1 && < 0.8, aeson >= 2.0 && < 2.3, diff --git a/pandoc.cabal b/pandoc.cabal index 4ff5cecfc..209e21770 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -541,7 +541,7 @@ library zip-archive >= 0.4.3.1 && < 0.5, zlib >= 0.5 && < 0.8, xml >= 1.3.12 && < 1.4, - typst >= 0.6 && < 0.6.1, + typst >= 0.6.1 && < 0.6.2, vector >= 0.12 && < 0.14, djot >= 0.1.2.2 && < 0.2, tls >= 2.0.1 && < 2.2, diff --git a/stack.yaml b/stack.yaml index ecb9cf159..4c989d754 100644 --- a/stack.yaml +++ b/stack.yaml @@ -23,8 +23,6 @@ extra-deps: - git: https://github.com/jgm/skylighting.git commit: 2b6876018a903207c7a9093c5c63b00a4d0980be subdirs: [skylighting-core, skylighting-format-blaze-html] -- git: https://github.com/jgm/typst-hs.git - commit: 5a50154c958d09c06fd884dcc4519403f7904bc1 - git: https://github.com/jgm/commonmark-hs.git commit: 1fddc913b31487571b12fd0ac99d4a0ab00acd34 subdirs: [commonmark-extensions, commonmark-pandoc]