Skip to content

Commit

Permalink
Bump pandoc version
Browse files Browse the repository at this point in the history
  • Loading branch information
@lierdakil
lierdakil committed Sep 11, 2022
1 parent 64e1ca3 commit b1aa6bb
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 52 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/haskell.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
pandocver: ["2.18"]
ghcver: ['8.10.7']
pandocver: ["2.19.2"]
ghcver: ['9.0.2']
include:
- os: ubuntu-latest
container: 'lierdakil/alpine-haskell:8.10.7-pwsh'
Expand All @@ -21,7 +21,7 @@ jobs:
if: '!(matrix.container)'
with:
ghc-version: ${{matrix.ghcver}}
cabal-version: '3.4'
cabal-version: '3.6'
- name: Cabal init
shell: pwsh
run: |
Expand Down Expand Up @@ -214,7 +214,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
pandocver: ["2.18"]
pandocver: ["2.19.2"]
steps:
- uses: actions/checkout@v2
- name: Install dependencies
Expand Down
10 changes: 5 additions & 5 deletions package.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ data-files:
- test/m2m/*/*
dependencies:
- base >=4.11 && <5
- text >=1.2.2 && <1.3
- pandoc >=2.18 && < 2.19
- text >=2.0.1 && <2.1
- pandoc >=2.18 && < 2.20
- pandoc-types >=1.22.2 && <1.23
library:
source-dirs: lib
Expand All @@ -30,7 +30,7 @@ library:
other-modules: []
dependencies:
- pandoc-crossref-internal
- mtl >=1.1 && <2.3
- mtl >=1.1 && <2.4
internal-libraries:
pandoc-crossref-internal:
other-modules: []
Expand Down Expand Up @@ -66,7 +66,7 @@ executables:
- -threaded
dependencies:
- pandoc-crossref
- optparse-applicative >= 0.13 && < 0.17
- optparse-applicative >= 0.13 && < 0.18
- open-browser >= 0.2 && < 0.3
- temporary >= 1.2 && < 1.4
- deepseq >= 1.4 && < 1.5
Expand Down Expand Up @@ -124,4 +124,4 @@ benchmarks:
- -threaded
dependencies:
- pandoc-crossref
- criterion >=1.5.9.0 && <1.6
- criterion >=1.5.9.0 && <1.7
35 changes: 19 additions & 16 deletions pandoc-crossref.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cabal-version: 2.0
--
-- see: https://github.com/sol/hpack
--
-- hash: 284171f1ac9b309f9076827741d8057c87cc91d18ea79b096192c8f9345ae485
-- hash: 5eb091301988afbd20489393babdd30cbc2d8719e1e25699f0b3c3d13d22aa75

name: pandoc-crossref
version: 0.3.13.0
Expand Down Expand Up @@ -38,6 +38,9 @@ data-files:
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
Expand Down Expand Up @@ -113,11 +116,11 @@ library
ghc-options: -Wall
build-depends:
base >=4.11 && <5
, mtl >=1.1 && <2.3
, pandoc ==2.18.*
, mtl >=1.1 && <2.4
, pandoc >=2.18 && <2.20
, pandoc-crossref-internal
, pandoc-types >=1.22.2 && <1.23
, text >=1.2.2 && <1.3
, text >=2.0.1 && <2.1
default-language: Haskell2010

library pandoc-crossref-internal
Expand Down Expand Up @@ -150,11 +153,11 @@ 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.3
, pandoc ==2.18.*
, 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 >=2.0.1 && <2.1
, utility-ht >=0.0.11 && <0.1.0
default-language: Haskell2010

Expand All @@ -170,13 +173,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.18.*
, optparse-applicative >=0.13 && <0.18
, pandoc >=2.18 && <2.20
, pandoc-crossref
, 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 >=2.0.1 && <2.1
default-language: Haskell2010

test-suite test-integrative
Expand All @@ -190,10 +193,10 @@ test-suite test-integrative
, directory >=1 && <1.4
, filepath >=1.1 && <1.5
, hspec >=2.4.4 && <3
, pandoc ==2.18.*
, pandoc >=2.18 && <2.20
, pandoc-crossref
, pandoc-types >=1.22.2 && <1.23
, text >=1.2.2 && <1.3
, text >=2.0.1 && <2.1
if flag(enable_flaky_tests)
cpp-options: -DFLAKY
default-language: Haskell2010
Expand All @@ -216,11 +219,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.18.*
, pandoc >=2.18 && <2.20
, pandoc-crossref
, pandoc-crossref-internal
, pandoc-types >=1.22.2 && <1.23
, text >=1.2.2 && <1.3
, text >=2.0.1 && <2.1
if flag(enable_flaky_tests)
cpp-options: -DFLAKY
default-language: Haskell2010
Expand All @@ -235,9 +238,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.18.*
, criterion >=1.5.9.0 && <1.7
, pandoc >=2.18 && <2.20
, pandoc-crossref
, pandoc-types >=1.22.2 && <1.23
, text >=1.2.2 && <1.3
, text >=2.0.1 && <2.1
default-language: Haskell2010
46 changes: 19 additions & 27 deletions stack.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,23 @@ ghc-options:
packages:
- .
extra-deps:
- pandoc-2.18
- citeproc-0.7@sha256:779de5879e324ea3304174de4fdb3d58867d5af9c1f67197051cef59435c9329,5655
- commonmark-0.2.2@sha256:e6b0b1889a56a53f8513a6b94f5d2f1eecd23f52bef90bcfe72fe322a8db7b74,3454
- commonmark-extensions-0.2.3.1@sha256:33faf9ffc71643aab1d914809647c8705717c4f2886f16b49a88bd5eeae17047,3486
- doclayout-0.4@sha256:9443bcad927de56d222f5f44d5f99270079f03f5deeb42485a7bba5b61184ba1,2414
- doctemplates-0.10.0.2@sha256:b261ba456a414dd233cd9795f5c16d2a77dc2e152bf0c39d232a8f2c0e78ee3b,3085
- hslua-2.2.0@sha256:2146a57f4af235cab2952014bb4e1c040c5b0fd95aad4e289a16024a889ff723,4877
- hslua-aeson-2.2.0
- pandoc-2.19.2
- citeproc-0.8.0.1@sha256:a6a9c4567c2b0a13d6b551e054538eab01a4156d1b27bf7bc31ccd1071bde9b5,5668
- doclayout-0.4@sha256:e98428855c12ca41233a0b6e9238b0f654d26ecf53e1e0236074a996ed595c36,2490
- gridtables-0.0.3.0@sha256:0c34cec7ff7fde5629baa6b17ba4e54fe73bc534feb48816341ad9807e284654,3055
- hslua-2.2.1@sha256:2d7aa66f0ae533dcea7228b55fa4b64f38e6a2bbc01cd8a52ecec159d4c37a0e,4751
- hslua-aeson-2.2.1@sha256:86be4742cb6620a4c0fd8930b04fdc2f8c0578007018d0594a65111140c3e0ff,3200
- skylighting-0.13@sha256:2f5cdf6562ace8f3dddc1e587ea652ba7175c05c1857df562478bfc93347350e,10667
- skylighting-core-0.13@sha256:394bdf703208963dab09a9ad4c6b7e3c243337cd24e1e820a820d3f8e45c7ccd,8033
- texmath-0.12.5.2@sha256:104c13d6cb238b54d3aa8ff6aa20dc4f7a22bc9c24e98186cc73699f39b988ad,6667
- doctemplates-0.10.0.2
- hslua-classes-2.2.0@sha256:a76550e77d82f0daecf0f110e14ce0bdf92c799a61aec8f448ce8a92f8d936cd,3828
- hslua-core-2.2.0@sha256:1bc7b42fc5c701f00bae2995bc8422eb02e22f8e6ff50dc6bcd325072985df1e,4306
- hslua-marshalling-2.2.0@sha256:7042bbe2b38bbc022624cf5016deeb1e684250abec166a140a6fef28f3082ecd,4017
- hslua-module-doclayout-1.0.4@sha256:2d526e1095328aaede64a40a9276abe257596f6c73e893bbfa0432b2744aaaa7,2693
- hslua-module-path-1.0.2@sha256:2238a21ada9fe8a8064b7b2f969a74868f64168e301fdd93c6bf4ff5c6354e2f,2697
- hslua-module-system-1.0.2@sha256:1958499d7a04f7faad2f98a134f988d3fe6d95f914b5090acc0032ffadcbfba1,3058
- hslua-module-text-1.0.2@sha256:bb3d9311b0ec1ef822a19e5f8a6da5dd8bc232965ceb0c5ac13d8a30d26bf567,2713
- hslua-module-version-1.0.2@sha256:e5c7199e131eb7caa246ed9cea16340377376ffa9fff84e7442bd73e3ef001e3,2666
- hslua-objectorientation-2.2.0.1@sha256:3f527c0c055ecb7df066f6b2bcbafdad992ad14ecc5b034cd920c6226e8b98bd,3410
- hslua-packaging-2.2.0.1@sha256:cef4f7f261bcecdce8688e54bbd4e3f871f81abca37acf57993405ccc21e82ad,3708
- ipynb-0.2@sha256:d3ec93f44fac7ddeb06e5419d0577321831cc903ecb176ca6be5015c55e9893a,1906
- lpeg-1.0.3@sha256:c64ed52f3aa92e4b5f5cba9f45424abd4cfd678d3ca35b6fca998078b47d3039,3556
- lua-2.2.0@sha256:9ab955e366d0a84f8fd93fa7afae544469e19bd6441b091fcadca1f9b0566f37,7499
- pandoc-lua-marshal-0.1.5.1@sha256:530a07d622c1a033eba0b26b96314b2d567a9fc36a291cc94fe093f2895cb616,5272
- pandoc-types-1.22.2@sha256:d6c4767cdecf4494a126a3812e3ec0b3031f63b047039930642822317e5d0c18,4073
- skylighting-0.12.3.1@sha256:b99a893d721e9b5f110f99dee8de70d79d5c07fbf6f43a9f65b27024cb104633,10448
- skylighting-core-0.12.3.1@sha256:436dc32581d42cfb207327153b61f36a851a6ad3ae2141dc7af79b76570f58e6,8053
- texmath-0.12.5@sha256:b5ff26862318501ceb1d64d78c8f6cb40014c586322cdea1b763b729fb9c5563,6609
- unicode-data-0.3.0@sha256:0545e079705a5381d0893f8fe8daaa08fc9174baeab269b9cf651817d8eadbc6,5123
resolver: lts-18.28
- hslua-core-2.2.1@sha256:7a1e409e49c95ae2c9fd969d6519f090a418e14889acaabb1c5f7ad9d1257cdc,4306
- hslua-marshalling-2.2.1@sha256:fd7052daf58cf218734082a41867c0da4e256d7b1e2463088e054ecc8963366f,3907
- hslua-objectorientation-2.2.1@sha256:0a7703080502e1e40f74db581fbaac963ce12691f30ae3e2129055723ade15a9,3408
- hslua-packaging-2.2.1@sha256:bb63fb69d4c1dfb5fcaecd36714ab666abef427d31bcace8939fe5547c39db4c,3706
- skylighting-format-ansi-0.1@sha256:4e525cb8fc5f13d9cf9d1f1d07120cc494d91bbfe39045c41b7ab6cf1c77a361,1353
- skylighting-format-blaze-html-0.1@sha256:8d7d2dfa38ed017e3b9447c6c73ba087d9633cd3a6adda4a3eba3990f9e1bf97,1274
- skylighting-format-latex-0.1@sha256:8631854e20604e497816b0bfdbcaaed7ff622e58fbbc365d4c3d08ef30052bd3,1237
- lua-2.2.1@sha256:667516181cf9b21ecc7b17509feb01f70aa6b4543eafafc86fcd64437d0cb60d,7499
resolver: lts-19.22

0 comments on commit b1aa6bb

Please sign in to comment.