Skip to content

Commit

Permalink
chore: support pandoc 3.6
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 Dec 14, 2024
1 parent 811cf9d commit 57dc591
Show file tree
Hide file tree
Showing 8 changed files with 333 additions and 322 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.5"
PANDOC_VERSION: "3.6"

jobs:
build:
Expand Down
9 changes: 5 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,14 +249,15 @@ for details.
# How to bump pandoc version

1. Change `PANDOC_VERSION` in `.github/workflows/haskell.yml` to the new Pandoc version.
2. Run `make update`. You need at least `nix`, `stack` and `cabal` (i.e. cabal-install) installed and in `PATH`.
2. Relax version bounds in `package.yaml` if needed.
3. Run `make update`. You need at least `nix`, `stack` and `cabal` (i.e. cabal-install) installed and in `PATH`.

If it doesn't do anything, consider nuking `cabal.project.freeze`, `flake.lock`, `stack.yaml` and `stack.yaml.lock` and trying again.
3. Build and test.
4. Fix broken tests.
4. Build and test.
5. Fix broken tests.

Note that you can regenerate most golden tests with either
`make regen-test-fixtures` if using Nix, or just running `./mkcheck.sh` and
`./mkinttest.sh` with appropriate `pandoc` and `pandoc-crossref` binaries in
scope (so e.g. via `stack exec`).
5. Repeat 3-4 until all tests pass.
6. Repeat 4-5 until all tests pass.
102 changes: 52 additions & 50 deletions cabal.project.freeze
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ constraints: any.Cabal ==3.10.3.0,
any.aeson-pretty ==0.8.10,
aeson-pretty -lib-only,
any.alex ==3.5.1.0,
any.ansi-terminal ==1.1.1,
any.ansi-terminal ==1.1.2,
ansi-terminal -example,
any.ansi-terminal-types ==1.1,
any.appar ==0.1.8,
Expand All @@ -31,9 +31,9 @@ constraints: any.Cabal ==3.10.3.0,
attoparsec -developer,
any.attoparsec-aeson ==2.2.2.0,
any.base ==4.18.2.1,
any.base-compat ==0.14.0,
any.base-compat-batteries ==0.14.0,
any.base-orphans ==0.9.2,
any.base-compat ==0.14.1,
any.base-compat-batteries ==0.14.1,
any.base-orphans ==0.9.3,
any.base16-bytestring ==1.0.2.0,
any.base64-bytestring ==1.2.1.0,
any.basement ==0.0.16,
Expand All @@ -48,7 +48,7 @@ constraints: any.Cabal ==3.10.3.0,
any.blaze-markup ==0.8.3.0,
any.byteorder ==1.0.4,
any.bytestring ==0.11.5.3,
any.cabal-doctest ==1.0.10,
any.cabal-doctest ==1.0.11,
any.call-stack ==0.4.0,
any.case-insensitive ==1.2.1.0,
any.cassava ==0.5.3.2,
Expand All @@ -57,39 +57,39 @@ constraints: any.Cabal ==3.10.3.0,
any.cereal ==0.5.8.3,
cereal -bytestring-builder,
any.character-ps ==0.1,
any.citeproc ==0.8.1.1,
any.citeproc ==0.8.1.2,
citeproc -executable -icu,
any.cmdargs ==0.10.22,
cmdargs +quotation -testprog,
any.code-page ==0.2.1,
any.colour ==2.3.6,
any.commonmark ==0.2.6.1,
any.commonmark-extensions ==0.2.5.5,
any.commonmark-pandoc ==0.2.2.2,
any.comonad ==5.0.8,
any.commonmark-extensions ==0.2.5.6,
any.commonmark-pandoc ==0.2.2.3,
any.comonad ==5.0.9,
comonad +containers +distributive +indexed-traversable,
any.conduit ==1.3.6,
any.conduit-extra ==1.3.6,
any.containers ==0.6.7,
any.contravariant ==1.5.5,
contravariant +semigroups +statevar +tagged,
any.cookie ==0.5.0,
any.criterion ==1.6.3.0,
any.criterion ==1.6.4.0,
criterion -embed-data-files -fast,
any.criterion-measurement ==0.2.2.0,
any.criterion-measurement ==0.2.3.0,
criterion-measurement -fast,
any.crypton ==1.0.0,
any.crypton ==1.0.1,
crypton -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq +support_pclmuldq +support_rdrand -support_sse +use_target_attributes,
any.crypton-connection ==0.4.1,
any.crypton-connection ==0.4.3,
any.crypton-x509 ==1.7.7,
any.crypton-x509-store ==1.6.9,
any.crypton-x509-system ==1.6.7,
any.crypton-x509-validation ==1.6.12,
any.data-default ==0.7.1.1,
any.data-default-class ==0.1.2.0,
any.data-default-instances-containers ==0.0.1,
any.data-default-instances-dlist ==0.0.1,
any.data-default-instances-old-locale ==0.0.1,
any.crypton-x509-validation ==1.6.13,
any.data-default ==0.7.1.3,
any.data-default-class ==0.1.2.2,
any.data-default-instances-containers ==0.1.0.3,
any.data-default-instances-dlist ==0.0.1.2,
any.data-default-instances-old-locale ==0.0.1.2,
any.data-fix ==0.3.4,
any.deepseq ==1.4.8.1,
any.dense-linear-algebra ==0.1.0.0,
Expand All @@ -114,12 +114,12 @@ constraints: any.Cabal ==3.10.3.0,
any.gitrev ==1.3.1,
any.gridtables ==0.1.0.0,
any.haddock-library ==1.11.0,
any.half ==0.3.1,
any.happy ==2.0.2,
any.happy-lib ==2.0.2,
any.half ==0.3.2,
any.happy ==2.1.3,
any.happy-lib ==2.1.3,
any.hashable ==1.5.0.0,
hashable -arch-native -random-initial-seed,
any.haskell-lexer ==1.1.1,
any.haskell-lexer ==1.1.2,
any.hourglass ==0.2.12,
any.hsc2hs ==0.68.10,
hsc2hs -in-ghc-tree,
Expand All @@ -142,21 +142,21 @@ constraints: any.Cabal ==3.10.3.0,
any.hslua-repl ==0.1.2,
hslua-repl -executable,
any.hslua-typing ==0.1.1,
any.hspec ==2.11.9,
any.hspec-core ==2.11.9,
any.hspec-discover ==2.11.9,
any.hspec ==2.11.10,
any.hspec-core ==2.11.10,
any.hspec-discover ==2.11.10,
any.hspec-expectations ==0.8.4,
any.http-client ==0.7.17,
http-client +network-uri,
any.http-client-tls ==0.3.6.3,
any.http-client-tls ==0.3.6.4,
any.http-types ==0.12.4,
any.indexed-traversable ==0.1.4,
any.indexed-traversable-instances ==0.1.2,
any.integer-conversion ==0.1.1,
any.integer-gmp ==1.1,
any.integer-logarithms ==1.0.3.1,
integer-logarithms -check-bounds +integer-gmp,
any.iproute ==1.7.14,
any.iproute ==1.7.15,
any.ipynb ==0.2,
any.isocline ==1.0.9,
any.jira-wiki-markup ==1.5.1,
Expand All @@ -182,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.4.0,
any.network ==3.2.7.0,
network -devel,
any.network-uri ==2.6.4.2,
any.old-locale ==1.0.0.7,
Expand All @@ -191,14 +191,14 @@ constraints: any.Cabal ==3.10.3.0,
any.optparse-applicative ==0.18.1.0,
optparse-applicative +process,
any.ordered-containers ==0.2.4,
any.os-string ==2.0.6,
any.pandoc ==3.5,
any.os-string ==2.0.7,
any.pandoc ==3.6,
pandoc -embed_data_files,
any.pandoc-cli ==3.5,
any.pandoc-cli ==3.6,
pandoc-cli +lua -nightly -server,
pandoc-crossref +enable_flaky_tests,
any.pandoc-lua-engine ==0.3.3,
any.pandoc-lua-marshal ==0.2.9,
any.pandoc-lua-engine ==0.4,
any.pandoc-lua-marshal ==0.3.0,
any.pandoc-types ==1.23.1,
any.parallel ==3.2.2.0,
any.parsec ==3.1.16.1,
Expand Down Expand Up @@ -226,12 +226,12 @@ constraints: any.Cabal ==3.10.3.0,
semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
any.serialise ==0.2.6.1,
serialise +newtime15,
any.skylighting ==0.14.3,
any.skylighting ==0.14.4,
skylighting -executable,
any.skylighting-core ==0.14.3,
any.skylighting-core ==0.14.4,
skylighting-core -executable,
any.skylighting-format-ansi ==0.1,
any.skylighting-format-blaze-html ==0.1.1.2,
any.skylighting-format-blaze-html ==0.1.1.3,
any.skylighting-format-context ==0.1.0.2,
any.skylighting-format-latex ==0.1,
any.socks ==0.6.1,
Expand All @@ -244,36 +244,38 @@ constraints: any.Cabal ==3.10.3.0,
streaming-commons -use-bytestring-builder,
any.strict ==0.5.1,
any.syb ==0.7.2.4,
any.tagged ==0.8.8,
any.tagged ==0.8.9,
tagged +deepseq +transformers,
any.tagsoup ==0.14.8,
any.tasty ==1.5.2,
tasty +unix,
any.template-haskell ==2.20.0.0,
any.temporary ==1.3,
any.texmath ==0.12.8.11,
any.texmath ==0.12.8.12,
texmath -executable -server,
any.text ==2.0.2,
any.text-conversions ==0.3.1.1,
any.text-iso8601 ==0.1.1,
any.text-short ==0.1.6,
text-short -asserts,
any.tf-random ==0.5,
any.th-abstraction ==0.7.0.0,
any.th-compat ==0.1.5,
any.th-lift ==0.8.4,
any.th-abstraction ==0.7.1.0,
any.th-compat ==0.1.6,
any.th-lift ==0.8.6,
any.th-lift-instances ==0.1.20,
any.these ==1.2.1,
any.time ==1.12.2,
any.time-compat ==1.9.7,
any.tls ==2.1.0,
any.tls ==2.1.5,
tls -devel,
any.toml-parser ==2.0.1.0,
any.transformers ==0.6.1.0,
any.transformers-compat ==0.7.2,
transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
any.typed-process ==0.2.12.0,
any.typst ==0.6,
any.typst ==0.6.1,
typst -executable,
any.typst-symbols ==0.1.6,
any.typst-symbols ==0.1.7,
any.unicode-collation ==0.1.3.6,
unicode-collation -doctests -executable,
any.unicode-data ==0.6.0,
Expand All @@ -282,27 +284,27 @@ constraints: any.Cabal ==3.10.3.0,
unicode-transforms -bench-show -dev -has-icu -has-llvm -use-gauge,
any.uniplate ==1.6.13,
any.unix ==2.8.4.0,
any.unix-time ==0.4.15,
any.unix-time ==0.4.16,
any.unliftio-core ==0.2.1.0,
any.unordered-containers ==0.2.20,
unordered-containers -debug,
any.utf8-string ==1.0.2,
any.utility-ht ==0.0.17.2,
any.uuid-types ==1.0.6,
any.vector ==0.13.1.0,
any.vector ==0.13.2.0,
vector +boundschecks -internalchecks -unsafechecks -wall,
any.vector-algorithms ==0.9.0.2,
any.vector-algorithms ==0.9.0.3,
vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks,
any.vector-binary-instances ==0.2.5.2,
any.vector-stream ==0.1.0.1,
any.vector-th-unbox ==0.2.2,
any.witherable ==0.5,
any.xml ==1.3.14,
any.xml-conduit ==1.9.1.3,
any.xml-conduit ==1.9.1.4,
any.xml-types ==0.3.8,
any.yaml ==0.11.11.2,
yaml +no-examples +no-exe,
any.zip-archive ==0.4.3.2,
zip-archive -executable,
any.zlib ==0.7.1.0,
index-state: hackage.haskell.org 2024-10-13T02:25:40Z
index-state: hackage.haskell.org 2024-12-12T22:33:02Z
42 changes: 21 additions & 21 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.6"
pandoc: ">=3.1.8 && < 3.7"
pandoc-types: ">= 1.23 && < 1.24"
_deps:
containers: &containers { containers: ">=0.1 && <0.7" }
Expand Down
Loading

0 comments on commit 57dc591

Please sign in to comment.