Skip to content

Commit

Permalink
Relax pandoc dependency to allow 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
lierdakil committed Feb 25, 2023
1 parent be436a0 commit ed1835c
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
pandocver: ["3.0"]
pandocver: ["3.1"]
ghcver: ['9.0.2']
include:
- os: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion package.yaml
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.1
- pandoc >=3.0 && < 3.1
- pandoc >=3.0 && < 3.2
- pandoc-types
library:
source-dirs: lib
Expand Down
18 changes: 9 additions & 9 deletions pandoc-crossref.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.0

-- This file has been generated from package.yaml by hpack version 0.34.4.
-- This file has been generated from package.yaml by hpack version 0.35.0.
--
-- see: https://github.com/sol/hpack

Expand Down Expand Up @@ -127,7 +127,7 @@ library
build-depends:
base >=4.11 && <5
, mtl >=1.1 && <2.4
, pandoc ==3.0.*
, pandoc >=3.0 && <3.2
, pandoc-crossref-internal
, pandoc-types
, text >=1.2.2 && <2.1
Expand Down Expand Up @@ -170,7 +170,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.3
, pandoc ==3.0.*
, pandoc >=3.0 && <3.2
, pandoc-types
, syb >=0.4 && <0.8
, template-haskell >=2.7.0.0 && <3.0.0.0
Expand All @@ -191,7 +191,7 @@ executable pandoc-crossref
, gitrev >=1.3.1 && <1.4
, open-browser ==0.2.*
, optparse-applicative >=0.13 && <0.18
, pandoc ==3.0.*
, pandoc >=3.0 && <3.2
, pandoc-crossref
, pandoc-types
, template-haskell >=2.7.0.0 && <3.0.0.0
Expand All @@ -212,13 +212,13 @@ test-suite test-integrative
, directory >=1 && <1.4
, filepath >=1.1 && <1.5
, hspec >=2.4.4 && <3
, pandoc ==3.0.*
, pandoc >=3.0 && <3.2
, pandoc-crossref
, pandoc-types
, text >=1.2.2 && <2.1
default-language: Haskell2010
if flag(enable_flaky_tests)
cpp-options: -DFLAKY
default-language: Haskell2010

test-suite test-pandoc-crossref
type: exitcode-stdio-1.0
Expand All @@ -238,14 +238,14 @@ 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 ==3.0.*
, pandoc >=3.0 && <3.2
, pandoc-crossref
, pandoc-crossref-internal
, pandoc-types
, text >=1.2.2 && <2.1
default-language: Haskell2010
if flag(enable_flaky_tests)
cpp-options: -DFLAKY
default-language: Haskell2010

benchmark simple
type: exitcode-stdio-1.0
Expand All @@ -258,7 +258,7 @@ benchmark simple
build-depends:
base >=4.11 && <5
, criterion >=1.5.9.0 && <1.7
, pandoc ==3.0.*
, pandoc >=3.0 && <3.2
, pandoc-crossref
, pandoc-types
, text >=1.2.2 && <2.1
Expand Down
48 changes: 16 additions & 32 deletions stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,42 +7,26 @@ ghc-options:
packages:
- .
extra-deps:
- pandoc-3.0
- commonmark-pandoc-0.2.1.3@sha256:993c99b8ab2ed8a5bc2a3b15430e373334d111f42cad9224b0033c336a1f6694,1153
- pandoc-types-1.23@sha256:bf5eac74d6b805520bd57a7be12af09370edde1a86ebffa9ff83eb9c9d860041,4140
- pandoc-cli-0.1@sha256:fbc6b6d43bedcef79c4d0409abeb2217ff2f297cfa0803d4bcc3c30c09df3ce8,2861
- pandoc-lua-engine-0.1@sha256:27f315a0c495f72fbe176c8fbc0306c5b356cfdeac741ad874d09a903c94feb1,6554
- pandoc-server-0.1@sha256:d25a6165af8c7b008f1c07bbf9cb01e3f2243743f2d1aff1fa5ef1e080b52511,2634
- pandoc-lua-marshal-0.2.0@sha256:745a64e3227fc7bb39f2e4c5b1e6bf66a1171f9fee485a2e3dff015907a95192,5376
- pandoc-3.1
- gridtables-0.1.0.0
- hslua-cli-1.2.0
- hslua-list-1.1.0.1
- hslua-module-zip-1.0.0
- jira-wiki-markup-1.5.0
- mime-types-0.1.1.0
- doctemplates-0.11
- texmath-0.12.6
- citeproc-0.8.1
- pandoc-types-1.23
- pandoc-lua-marshal-0.2.0
- commonmark-pandoc-0.2.1.3
- skylighting-0.13.2.1
- skylighting-core-0.13.2.1

- gridtables-0.1.0.0@sha256:d76a3bc6a0e6719471e38beadef657e8e31f7fb927899407fcd09b39f3c2636d,2961
- citeproc-0.8.1@sha256:12cacc475032e618365698e8923cb33ebc36c873f6b7bcf88631d3657b1e85cd,5666
- doclayout-0.4@sha256:e98428855c12ca41233a0b6e9238b0f654d26ecf53e1e0236074a996ed595c36,2490
- doctemplates-0.11@sha256:42922bf2ea2c166f8d7ffd1df0e23ce69b6400f95fa195aeb932b13c932fe933,3025
- jira-wiki-markup-1.5.0@sha256:6a279fa487dad08a9c571a5e5ea4ba0b81c88b2225958c9c6ce6461c4b34c7a0,3408
- skylighting-0.13.2@sha256:8256cf117bd751d6416d6f522ac8f10523d76e86f1a3e3801da65b0956e262f9,10917
- skylighting-core-0.13.2@sha256:346eeea692b2b6189c19d00c00ece4055191c9ae646ed32742bbe5c7dbdb48d2,7813
- texmath-0.12.5.5@sha256:435e38acc4807682e79d647f6add5d68e92180439a6f03a5f315fea57ee88304,6667
- skylighting-format-ansi-0.1@sha256:4e525cb8fc5f13d9cf9d1f1d07120cc494d91bbfe39045c41b7ab6cf1c77a361,1353
- skylighting-format-blaze-html-0.1.1@sha256:9e6cf17156f6b379439aece1cd79ff3baefe41bd0eb617882aba656d07be12d1,1290
- skylighting-format-context-0.1.0.1@sha256:b0c8939098a9311e10dc9b9701ef6d2f960e818ddd978c848751bfbff4076f0c,1335
- skylighting-format-context-0.1.0.2@sha256:1eacb2bc470821c7fbe778e92b8915b9e45931a25c6a57e2b5edee3021d908c8,1335
- skylighting-format-latex-0.1@sha256:8631854e20604e497816b0bfdbcaaed7ff622e58fbbc365d4c3d08ef30052bd3,1237

- hslua-cli-1.2.0@sha256:9ddd8c0281c718efd21015e268b30f71c0755616af1605ecad90d88e9417442e,2636
- hslua-2.2.1@sha256:2d7aa66f0ae533dcea7228b55fa4b64f38e6a2bbc01cd8a52ecec159d4c37a0e,4751
- hslua-aeson-2.2.1@sha256:86be4742cb6620a4c0fd8930b04fdc2f8c0578007018d0594a65111140c3e0ff,3200
- hslua-core-2.2.1@sha256:7a1e409e49c95ae2c9fd969d6519f090a418e14889acaabb1c5f7ad9d1257cdc,4306
- hslua-marshalling-2.2.1@sha256:fd7052daf58cf218734082a41867c0da4e256d7b1e2463088e054ecc8963366f,3907
- hslua-module-doclayout-1.0.4@sha256:2d526e1095328aaede64a40a9276abe257596f6c73e893bbfa0432b2744aaaa7,2693
- hslua-module-path-1.0.3@sha256:9764d9a4f1ddc0cf47e91dbf23919095434f4926cebea82de516cf2731e89089,2697
- hslua-module-system-1.0.2@sha256:1958499d7a04f7faad2f98a134f988d3fe6d95f914b5090acc0032ffadcbfba1,3058
- hslua-module-text-1.0.3.1@sha256:101cc63fcbfce9ff03532278db19879c4ed6a89e942a5f42a251e55a7df2046b,2681
- hslua-module-version-1.0.3@sha256:0722de7a187152e182d384c52585e3402a8a3ef7a6da1422a3ebc982576654a1,2666
- hslua-module-zip-1.0.0@sha256:05017e6a0f3fb45073e0f42f4ccd4a6b0d3ba77bde1d3e74e21e50fd13f59b33,2946
- hslua-classes-2.2.0@sha256:a76550e77d82f0daecf0f110e14ce0bdf92c799a61aec8f448ce8a92f8d936cd,3828
- hslua-list-1.1.0.1@sha256:e7647fb9bd32651318164839414a22a01ce5ad93009ca8757922d0e093411819,2404
- hslua-objectorientation-2.2.1@sha256:0a7703080502e1e40f74db581fbaac963ce12691f30ae3e2129055723ade15a9,3408
- hslua-packaging-2.2.1@sha256:bb63fb69d4c1dfb5fcaecd36714ab666abef427d31bcace8939fe5547c39db4c,3706
- lua-2.2.1@sha256:667516181cf9b21ecc7b17509feb01f70aa6b4543eafafc86fcd64437d0cb60d,7499
resolver: lts-19.33
allow-newer: false

0 comments on commit ed1835c

Please sign in to comment.