From 5d41064ec6ad21adf0f1eebd8edcd9b4ea629d2b Mon Sep 17 00:00:00 2001 From: Senwen Deng <36327760+snwnde@users.noreply.github.com> Date: Sat, 4 Mar 2023 20:08:10 +0100 Subject: [PATCH] pandoc: update to 2.19.2. --- srcpkgs/pandoc/files/pandoc-crossref.cabal | 152 +++++++++++++++++---- srcpkgs/pandoc/template | 17 +-- 2 files changed, 134 insertions(+), 35 deletions(-) diff --git a/srcpkgs/pandoc/files/pandoc-crossref.cabal b/srcpkgs/pandoc/files/pandoc-crossref.cabal index 7aacc47278f3..bd15f757b257 100644 --- a/srcpkgs/pandoc/files/pandoc-crossref.cabal +++ b/srcpkgs/pandoc/files/pandoc-crossref.cabal @@ -1,13 +1,11 @@ cabal-version: 2.0 --- This file has been generated from package.yaml by hpack version 0.34.6. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack --- --- hash: 20655cd6263e9fe7e5737ee81b093c8c6f5eae67e260ddd3a821ac6ef5e35e69 name: pandoc-crossref -version: 0.3.13.0 +version: 0.3.14.0 synopsis: Pandoc filter for cross-references description: pandoc-crossref is a pandoc filter for numbering figures, equations, tables and cross-references to them. category: Text @@ -18,6 +16,98 @@ maintainer: root@livid.pp.ru license: GPL-2 license-file: LICENSE build-type: Simple +extra-source-files: + test/demo-chapters.inc + test/demo.inc + CHANGELOG.md + licenses/LICENSE.roman-numerals +data-files: + docs/demo/demo.md + docs/index.md + test/m2m/chapDelim/expect.md + test/m2m/chapDelim/expect.tex + test/m2m/chapDelim/input.md + test/m2m/delim/expect.md + test/m2m/delim/expect.tex + test/m2m/delim/input.md + test/m2m/emptyChapterLabels/expect.md + test/m2m/emptyChapterLabels/expect.tex + test/m2m/emptyChapterLabels/input.md + test/m2m/eqnBlockTemplate/expect.md + test/m2m/eqnBlockTemplate/expect.tex + test/m2m/eqnBlockTemplate/input.md + test/m2m/eqnInlineTemplate/expect.md + test/m2m/eqnInlineTemplate/expect.tex + test/m2m/eqnInlineTemplate/input.md + test/m2m/equationNumberLaTeX/expect.md + test/m2m/equationNumberLaTeX/expect.tex + test/m2m/equationNumberLaTeX/input.md + test/m2m/equations-auto/expect.md + test/m2m/equations-auto/expect.tex + test/m2m/equations-auto/input.md + test/m2m/equations-tables-auto/expect.md + test/m2m/equations-tables-auto/expect.tex + test/m2m/equations-tables-auto/input.md + test/m2m/equations-tables/expect.md + test/m2m/equations-tables/expect.tex + test/m2m/equations-tables/input.md + test/m2m/equations/expect.md + test/m2m/equations/expect.tex + test/m2m/equations/input.md + test/m2m/label-precedence/expect.md + test/m2m/label-precedence/expect.tex + test/m2m/label-precedence/input.md + test/m2m/links-names/expect.md + test/m2m/links-names/expect.tex + test/m2m/links-names/input.md + test/m2m/links/expect.md + test/m2m/links/expect.tex + test/m2m/links/input.md + test/m2m/listing-captions-ids/expect.md + test/m2m/listing-captions-ids/expect.tex + test/m2m/listing-captions-ids/input.md + test/m2m/listings-code-block-caption-278/expect.md + test/m2m/listings-code-block-caption-278/expect.tex + test/m2m/listings-code-block-caption-278/input.md + test/m2m/listOfTemplates-buillet-list/expect.md + test/m2m/listOfTemplates-buillet-list/expect.tex + test/m2m/listOfTemplates-buillet-list/input.md + test/m2m/listOfTemplates-ord-list/expect.md + test/m2m/listOfTemplates-ord-list/expect.tex + test/m2m/listOfTemplates-ord-list/input.md + test/m2m/listOfTemplates/expect.md + test/m2m/listOfTemplates/expect.tex + test/m2m/listOfTemplates/input.md + test/m2m/loxItemTitle/expect.md + test/m2m/loxItemTitle/expect.tex + test/m2m/loxItemTitle/input.md + test/m2m/multiple-eqn-same-para/expect.md + test/m2m/multiple-eqn-same-para/expect.tex + test/m2m/multiple-eqn-same-para/input.md + test/m2m/secLabels/expect.md + test/m2m/secLabels/expect.tex + test/m2m/secLabels/input.md + test/m2m/secLevelLabels/expect.md + test/m2m/secLevelLabels/expect.tex + test/m2m/secLevelLabels/input.md + test/m2m/section-template/expect.md + test/m2m/section-template/expect.tex + test/m2m/section-template/input.md + test/m2m/setLabelAttribute/expect.md + test/m2m/setLabelAttribute/expect.tex + test/m2m/setLabelAttribute/input.md + test/m2m/subfigures-ccsDelim/expect.md + test/m2m/subfigures-ccsDelim/expect.tex + test/m2m/subfigures-ccsDelim/input.md + test/m2m/subfigures-grid/expect.md + test/m2m/subfigures-grid/expect.tex + test/m2m/subfigures-grid/input.md + test/m2m/subfigures/expect.md + test/m2m/subfigures/expect.tex + test/m2m/subfigures/input.md + test/m2m/titlesInRefs/expect.md + test/m2m/titlesInRefs/expect.tex + test/m2m/titlesInRefs/input.md source-repository head type: git @@ -31,7 +121,21 @@ flag enable_flaky_tests library exposed-modules: Text.Pandoc.CrossRef - other-modules: + hs-source-dirs: + lib + ghc-options: -Wall + build-depends: + base >=4.11 && <5 + , mtl >=1.1 && <2.4 + , pandoc >=2.18 && <2.20 + , pandoc-crossref-internal + , pandoc-types >=1.22.2 && <1.23 + , text >=1.2.2 && <2.1 + default-language: Haskell2010 + +library pandoc-crossref-internal + exposed-modules: + Text.Numeral.Roman Text.Pandoc.CrossRef.References Text.Pandoc.CrossRef.References.Blocks Text.Pandoc.CrossRef.References.List @@ -48,9 +152,7 @@ library Text.Pandoc.CrossRef.Util.Template Text.Pandoc.CrossRef.Util.Util hs-source-dirs: - lib lib-internal - ghc-options: -Wall build-depends: base >=4.11 && <5 , containers >=0.1 && <0.7 @@ -61,12 +163,11 @@ library , microlens-mtl >=0.2.0.1 && <0.3.0.0 , microlens-th >=0.4.3.10 && <0.5.0.0 , mtl >=1.1 && <2.3 - , pandoc >=2.10 && <2.18 - , pandoc-types >=1.21 && <1.23 - , roman-numerals ==0.5.* + , pandoc >=2.18 && <2.20 + , pandoc-types >=1.22.2 && <1.23 , syb >=0.4 && <0.8 , template-haskell >=2.7.0.0 && <3.0.0.0 - , text >=1.2.2 && <1.3 + , text >=1.2.2 && <2.1 , utility-ht >=0.0.11 && <0.1.0 default-language: Haskell2010 @@ -82,13 +183,13 @@ executable pandoc-crossref , deepseq ==1.4.* , gitrev >=1.3.1 && <1.4 , open-browser ==0.2.* - , optparse-applicative >=0.13 && <0.17 - , pandoc >=2.10 && <2.18 + , optparse-applicative >=0.13 && <0.18 + , pandoc >=2.18 && <2.20 , pandoc-crossref - , pandoc-types >=1.21 && <1.23 + , pandoc-types >=1.22.2 && <1.23 , template-haskell >=2.7.0.0 && <3.0.0.0 , temporary >=1.2 && <1.4 - , text >=1.2.2 && <1.3 + , text >=1.2.2 && <2.1 default-language: Haskell2010 test-suite test-integrative @@ -102,10 +203,10 @@ test-suite test-integrative , directory >=1 && <1.4 , filepath >=1.1 && <1.5 , hspec >=2.4.4 && <3 - , pandoc >=2.10 && <2.18 + , pandoc >=2.18 && <2.20 , pandoc-crossref - , pandoc-types >=1.21 && <1.23 - , text >=1.2.2 && <1.3 + , pandoc-types >=1.22.2 && <1.23 + , text >=1.2.2 && <2.1 if flag(enable_flaky_tests) cpp-options: -DFLAKY default-language: Haskell2010 @@ -128,10 +229,11 @@ test-suite test-pandoc-crossref , hspec >=2.4.4 && <3 , microlens >=0.4.12.0 && <0.5.0.0 , mtl >=1.1 && <2.3 - , pandoc >=2.10 && <2.18 + , pandoc >=2.18 && <2.20 , pandoc-crossref - , pandoc-types >=1.21 && <1.23 - , text >=1.2.2 && <1.3 + , pandoc-crossref-internal + , pandoc-types >=1.22.2 && <1.23 + , text >=1.2.2 && <2.1 if flag(enable_flaky_tests) cpp-options: -DFLAKY default-language: Haskell2010 @@ -146,9 +248,9 @@ benchmark simple ghc-options: -Wall -fno-warn-unused-do-bind -threaded build-depends: base >=4.11 && <5 - , criterion >=1.5.9.0 && <1.6 - , pandoc >=2.10 && <2.18 + , criterion >=1.5.9.0 && <1.7 + , pandoc >=2.18 && <2.20 , pandoc-crossref - , pandoc-types >=1.21 && <1.23 - , text >=1.2.2 && <1.3 + , pandoc-types >=1.22.2 && <1.23 + , text >=1.2.2 && <2.1 default-language: Haskell2010 diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template index 9bdf32ef3c53..01d2614e821e 100644 --- a/srcpkgs/pandoc/template +++ b/srcpkgs/pandoc/template @@ -1,20 +1,19 @@ # Template file for 'pandoc' pkgname=pandoc # Keep in sync with http://www.stackage.org/lts -version=2.17.1.1 +version=2.19.2 revision=1 _sidenote_version=0.22.1.0 _monad_gen_version=0.3.0.1 -_crossref_version=0.3.12.2 -_roman_numerals_version=0.5.1.5 +_crossref_version=0.3.14.0 create_wrksrc=yes build_style=haskell-stack -stackage="lts-19.0" +stackage="lts-20.13" make_build_args=" --flag pandoc:embed_data_files --flag=lua:pkg-config" hostmakedepends="pkg-config unzip wget" -makedepends="zlib-devel lua53-devel tar" +makedepends="zlib-devel lua54-devel tar" short_desc="Universal converter between markup formats" maintainer="slotThe " license="GPL-2.0-or-later, BSD-3-Clause" @@ -22,13 +21,11 @@ homepage="http://johnmacfarlane.net/pandoc/" distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz https://hackage.haskell.org/package/${pkgname}-sidenote-${_sidenote_version}/${pkgname}-sidenote-${_sidenote_version}.tar.gz https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz - https://hackage.haskell.org/package/${pkgname}-crossref-${_crossref_version}/${pkgname}-crossref-${_crossref_version}.tar.gz - https://hackage.haskell.org/package/roman-numerals-${_roman_numerals_version}/roman-numerals-${_roman_numerals_version}.tar.gz" -checksum="649ec528d1413130c5ce304b826ff473b3696269eea8834d908589e775bd1ad1 + https://hackage.haskell.org/package/${pkgname}-crossref-${_crossref_version}/${pkgname}-crossref-${_crossref_version}.tar.gz" +checksum="36e83694c36a5af35a4442c4d5abd4273289d9d309793466f59c1632e87d4245 c39dd7343b9cb4dc5b1c91c9e47c3d357874e9e1a30b8d377bbea0b1d50323b2 be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465 - 94540325c9c98ae4d5199c634bf402ffa41e3c5b020d7207daef90fd9e224fb4 - b9c7195b69b1662a286d2c28a55fafdcb693c522ba5eb54a11b1d0a4e92eaa81" + 06d163e2cec3f285919295c41a0580f203bb157d05eb06a494dbc093cbefa5b8" subpackages=" pandoc-sidenote pandoc-crossref"