Skip to content

Commit

Permalink
chore: support pandoc 3.5
Browse files Browse the repository at this point in the history 
Signed-off-by: Rui Chen <[email protected]>
  • Loading branch information
@chenrui333 @lierdakil
chenrui333 authored and lierdakil committed Oct 13, 2024
1 parent 6cff8a6 commit b43a79c
Show file tree
Hide file tree
Showing 7 changed files with 101 additions and 102 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/haskell.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Haskell CI
on: [push]

env:
PANDOC_VERSION: "3.4"
PANDOC_VERSION: "3.5"

jobs:
build:
Expand Down
29 changes: 14 additions & 15 deletions cabal.project.freeze
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ constraints: any.Cabal ==3.10.3.0,
any.Only ==0.1,
any.QuickCheck ==2.15.0.1,
QuickCheck -old-random +templatehaskell,
any.SHA ==1.6.4.4,
SHA -exe,
any.StateVar ==1.2.2,
any.aeson ==2.2.3.0,
aeson +ordered-keymap,
Expand Down Expand Up @@ -65,9 +63,9 @@ constraints: any.Cabal ==3.10.3.0,
cmdargs +quotation -testprog,
any.code-page ==0.2.1,
any.colour ==2.3.6,
any.commonmark ==0.2.6,
any.commonmark ==0.2.6.1,
any.commonmark-extensions ==0.2.5.5,
any.commonmark-pandoc ==0.2.2.1,
any.commonmark-pandoc ==0.2.2.2,
any.comonad ==5.0.8,
comonad +containers +distributive +indexed-traversable,
any.conduit ==1.3.6,
Expand Down Expand Up @@ -100,7 +98,7 @@ constraints: any.Cabal ==3.10.3.0,
any.directory ==1.3.8.5,
any.distributive ==0.6.2.1,
distributive +semigroups +tagged,
any.djot ==0.1.2.1,
any.djot ==0.1.2.2,
any.dlist ==1.0,
dlist -werror,
any.doclayout ==0.5,
Expand All @@ -117,7 +115,8 @@ constraints: any.Cabal ==3.10.3.0,
any.gridtables ==0.1.0.0,
any.haddock-library ==1.11.0,
any.half ==0.3.1,
any.happy ==1.20.1.1,
any.happy ==2.0.2,
any.happy-lib ==2.0.2,
any.hashable ==1.5.0.0,
hashable -arch-native -random-initial-seed,
any.haskell-lexer ==1.1.1,
Expand All @@ -130,9 +129,9 @@ constraints: any.Cabal ==3.10.3.0,
any.hslua-cli ==1.4.3,
hslua-cli -executable,
any.hslua-core ==2.3.2,
any.hslua-list ==1.1.1,
any.hslua-list ==1.1.4,
any.hslua-marshalling ==2.3.1,
any.hslua-module-doclayout ==1.1.1.2,
any.hslua-module-doclayout ==1.2.0,
any.hslua-module-path ==1.1.1,
any.hslua-module-system ==1.1.2,
any.hslua-module-text ==1.1.1,
Expand Down Expand Up @@ -183,7 +182,7 @@ constraints: any.Cabal ==3.10.3.0,
any.mtl ==2.3.1,
any.mwc-random ==0.15.1.0,
mwc-random -benchpapi,
any.network ==3.2.3.0,
any.network ==3.2.4.0,
network -devel,
any.network-uri ==2.6.4.2,
any.old-locale ==1.0.0.7,
Expand All @@ -193,13 +192,13 @@ constraints: any.Cabal ==3.10.3.0,
optparse-applicative +process,
any.ordered-containers ==0.2.4,
any.os-string ==2.0.6,
any.pandoc ==3.4,
any.pandoc ==3.5,
pandoc -embed_data_files,
any.pandoc-cli ==3.4,
any.pandoc-cli ==3.5,
pandoc-cli +lua -nightly -server,
pandoc-crossref +enable_flaky_tests,
any.pandoc-lua-engine ==0.3.2,
any.pandoc-lua-marshal ==0.2.7.1,
any.pandoc-lua-engine ==0.3.3,
any.pandoc-lua-marshal ==0.2.9,
any.pandoc-types ==1.23.1,
any.parallel ==3.2.2.0,
any.parsec ==3.1.16.1,
Expand Down Expand Up @@ -250,7 +249,7 @@ constraints: any.Cabal ==3.10.3.0,
any.tagsoup ==0.14.8,
any.template-haskell ==2.20.0.0,
any.temporary ==1.3,
any.texmath ==0.12.8.10,
any.texmath ==0.12.8.11,
texmath -executable -server,
any.text ==2.0.2,
any.text-conversions ==0.3.1.1,
Expand Down Expand Up @@ -306,4 +305,4 @@ constraints: any.Cabal ==3.10.3.0,
any.zip-archive ==0.4.3.2,
zip-archive -executable,
any.zlib ==0.7.1.0,
index-state: hackage.haskell.org 2024-09-17T18:28:54Z
index-state: hackage.haskell.org 2024-10-13T02:25:40Z
30 changes: 15 additions & 15 deletions flake.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ data-files:
dependencies:
base: ">=4.11 && <5"
text: ">=1.2.2 && <2.2"
pandoc: ">=3.1.8 && < 3.5"
pandoc: ">=3.1.8 && < 3.6"
pandoc-types: ">= 1.23 && < 1.24"
_deps:
containers: &containers { containers: ">=0.1 && <0.7" }
Expand Down
12 changes: 6 additions & 6 deletions pandoc-crossref.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ library
build-depends:
base >=4.11 && <5
, mtl >=1.1 && <2.4
, pandoc >=3.1.8 && <3.5
, pandoc >=3.1.8 && <3.6
, pandoc-crossref-internal
, pandoc-types ==1.23.*
, text >=1.2.2 && <2.2
Expand Down Expand Up @@ -183,7 +183,7 @@ library pandoc-crossref-internal
, microlens-mtl >=0.2.0.1 && <0.3.0.0
, microlens-th >=0.4.3.10 && <0.5.0.0
, mtl >=1.1 && <2.4
, pandoc >=3.1.8 && <3.5
, pandoc >=3.1.8 && <3.6
, pandoc-types ==1.23.*
, syb >=0.4 && <0.8
, template-haskell >=2.7.0.0 && <3.0.0.0
Expand All @@ -204,7 +204,7 @@ executable pandoc-crossref
, gitrev >=1.3.1 && <1.4
, open-browser ==0.2.*
, optparse-applicative >=0.13 && <0.19
, pandoc >=3.1.8 && <3.5
, pandoc >=3.1.8 && <3.6
, pandoc-crossref
, pandoc-types ==1.23.*
, template-haskell >=2.7.0.0 && <3.0.0.0
Expand All @@ -225,7 +225,7 @@ test-suite test-integrative
, directory >=1 && <1.4
, filepath >=1.1 && <1.6
, hspec >=2.4.4 && <3
, pandoc >=3.1.8 && <3.5
, pandoc >=3.1.8 && <3.6
, pandoc-crossref
, pandoc-types ==1.23.*
, text >=1.2.2 && <2.2
Expand All @@ -251,7 +251,7 @@ test-suite test-pandoc-crossref
, hspec >=2.4.4 && <3
, microlens >=0.4.12.0 && <0.5.0.0
, mtl >=1.1 && <2.4
, pandoc >=3.1.8 && <3.5
, pandoc >=3.1.8 && <3.6
, pandoc-crossref
, pandoc-crossref-internal
, pandoc-types ==1.23.*
Expand All @@ -271,7 +271,7 @@ benchmark simple
build-depends:
base >=4.11 && <5
, criterion >=1.5.9.0 && <1.7
, pandoc >=3.1.8 && <3.5
, pandoc >=3.1.8 && <3.6
, pandoc-crossref
, pandoc-types ==1.23.*
, text >=1.2.2 && <2.2
Expand Down
26 changes: 13 additions & 13 deletions stack.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ extra-deps:
- OneTuple-0.4.2
- Only-0.1
- QuickCheck-2.15.0.1
- SHA-1.6.4.4
- StateVar-1.2.2
- aeson-2.2.3.0
- aeson-pretty-0.8.10
Expand Down Expand Up @@ -63,9 +62,9 @@ extra-deps:
- cmdargs-0.10.22
- code-page-0.2.1
- colour-2.3.6
- commonmark-0.2.6
- commonmark-0.2.6.1
- commonmark-extensions-0.2.5.5
- commonmark-pandoc-0.2.2.1
- commonmark-pandoc-0.2.2.2
- comonad-5.0.8
- conduit-1.3.6
- conduit-extra-1.3.6
Expand All @@ -91,7 +90,7 @@ extra-deps:
- digest-0.0.2.1
- directory-1.3.8.5
- distributive-0.6.2.1
- djot-0.1.2.1
- djot-0.1.2.2
- dlist-1.0
- doclayout-0.5
- doctemplates-0.11.0.1
Expand All @@ -105,7 +104,8 @@ extra-deps:
- gridtables-0.1.0.0
- haddock-library-1.11.0
- half-0.3.1
- happy-1.20.1.1
- happy-2.0.2
- happy-lib-2.0.2
- hashable-1.5.0.0
- haskell-lexer-1.1.1
- hourglass-0.2.12
Expand All @@ -115,9 +115,9 @@ extra-deps:
- hslua-classes-2.3.1
- hslua-cli-1.4.3
- hslua-core-2.3.2
- hslua-list-1.1.1
- hslua-list-1.1.4
- hslua-marshalling-2.3.1
- hslua-module-doclayout-1.1.1.2
- hslua-module-doclayout-1.2.0
- hslua-module-path-1.1.1
- hslua-module-system-1.1.2
- hslua-module-text-1.1.1
Expand Down Expand Up @@ -159,18 +159,18 @@ extra-deps:
- mono-traversable-1.0.20.0
- mtl-2.3.1
- mwc-random-0.15.1.0
- network-3.2.3.0
- network-3.2.4.0
- network-uri-2.6.4.2
- old-locale-1.0.0.7
- old-time-1.1.0.4
- open-browser-0.2.1.0
- optparse-applicative-0.18.1.0
- ordered-containers-0.2.4
- os-string-2.0.6
- pandoc-3.4
- pandoc-cli-3.4
- pandoc-lua-engine-0.3.2
- pandoc-lua-marshal-0.2.7.1
- pandoc-3.5
- pandoc-cli-3.5
- pandoc-lua-engine-0.3.3
- pandoc-lua-marshal-0.2.9
- pandoc-types-1.23.1
- parallel-3.2.2.0
- parsec-3.1.16.1
Expand Down Expand Up @@ -209,7 +209,7 @@ extra-deps:
- tagsoup-0.14.8
- template-haskell-2.20.0.0
- temporary-1.3
- texmath-0.12.8.10
- texmath-0.12.8.11
- text-2.0.2
- text-conversions-0.3.1.1
- text-iso8601-0.1.1
Expand Down
Loading

0 comments on commit b43a79c

Please sign in to comment.