diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2021-10-23 16:17:49 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2021-10-23 16:27:51 -0700 |
| commit | 87a98b76ce80ee53acfc54fcd8768c332413efe1 (patch) | |
| tree | 866cc87a998cab0d1997113e543d3113dbce487b | |
| parent | 2d3813e0dd7c2752bf299eb39e0b226d911920f1 (diff) | |
| download | pandoc-87a98b76ce80ee53acfc54fcd8768c332413efe1.tar.gz | |
Use ipynb 0.1.0.2.
With this change pandoc can be built with aeson >= 2.
| -rw-r--r-- | cabal.project | 13 | ||||
| -rw-r--r-- | pandoc.cabal | 4 | ||||
| -rw-r--r-- | stack.yaml | 2 |
3 files changed, 5 insertions, 14 deletions
diff --git a/cabal.project b/cabal.project index 4dacd344c..b0606c372 100644 --- a/cabal.project +++ b/cabal.project @@ -1,16 +1,5 @@ packages: pandoc.cabal tests: True flags: +embed_data_files --- constraints: aeson >= 2.0.1.0 +constraints: aeson >= 2.0.1.0 --- Needed to build with aeson 2 - --- source-repository-package --- type: git --- location: https://github.com/hasufell/aeson-pretty.git --- tag: e902ab866bb41d990b66af3644aeb352ff7aaf6f - --- source-repository-package --- type: git --- location: https://github.com/jgm/ipynb.git --- tag: 1f1ddb29227335091a3a158b9aeeeb47a372c683 diff --git a/pandoc.cabal b/pandoc.cabal index 126405792..ca9fc9245 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -526,7 +526,7 @@ library JuicyPixels >= 3.1.6.1 && < 3.4, SHA >= 1.6 && < 1.7, aeson >= 0.7 && < 2.1, - aeson-pretty >= 0.8.5 && < 0.9, + aeson-pretty >= 0.8.9 && < 0.9, array >= 0.5 && < 0.6, attoparsec >= 0.12 && < 0.15, base64-bytestring >= 0.1 && < 1.3, @@ -560,7 +560,7 @@ library http-client >= 0.4.30 && < 0.8, http-client-tls >= 0.2.4 && < 0.4, http-types >= 0.8 && < 0.13, - ipynb >= 0.1 && < 0.2, + ipynb >= 0.1.0.2 && < 0.2, jira-wiki-markup >= 1.4 && < 1.5, mtl >= 2.2 && < 2.3, network >= 2.6, diff --git a/stack.yaml b/stack.yaml index f46485335..145b53134 100644 --- a/stack.yaml +++ b/stack.yaml @@ -30,6 +30,8 @@ extra-deps: - commonmark-0.2.1.1 - commonmark-extensions-0.2.2 - citeproc-0.6 +- aeson-pretty-0.8.9 +- ipynb-0.1.0.2 ghc-options: "$locals": -fhide-source-paths -Wno-missing-home-modules resolver: lts-18.10 |