diff options
| author | John MacFarlane <[email protected]> | 2022-01-09 14:29:07 -0800 |
|---|---|---|
| committer | John MacFarlane <[email protected]> | 2022-01-09 15:30:22 -0800 |
| commit | 33da5833de602a85b9f41a500f2e5516d4b9dcfa (patch) | |
| tree | 3a7d0ab77fac92c85446bc184c01c2f26b9fceed | |
| parent | d9e9f119c524bcf7dff12cbccf134ce4227ad8ae (diff) | |
Update commits for dev dependencies, allow text 2.0.
| -rw-r--r-- | cabal.project | 14 | ||||
| -rw-r--r-- | pandoc.cabal | 6 | ||||
| -rw-r--r-- | stack.yaml | 10 |
3 files changed, 19 insertions, 11 deletions
diff --git a/cabal.project b/cabal.project index c38007dd2..5402abd16 100644 --- a/cabal.project +++ b/cabal.project @@ -6,26 +6,32 @@ constraints: aeson >= 2.0.1.0 source-repository-package type: git location: https://github.com/jgm/texmath.git - tag: 46df85d747f4f233157d3476683264232a4f58be + tag: 9a5b233a6a995b6b6d11051367984c76e457d9f7 source-repository-package type: git location: https://github.com/jgm/commonmark-hs - tag: a60de5bb3d9905d0bc9d833e5df643f1130076b2 + tag: 530c6d93c9d7f84b1d71e10d23c1bfaee82e86bd subdir: commonmark-pandoc source-repository-package type: git location: https://github.com/jgm/commonmark-hs - tag: a60de5bb3d9905d0bc9d833e5df643f1130076b2 + tag: 530c6d93c9d7f84b1d71e10d23c1bfaee82e86bd subdir: commonmark-extensions source-repository-package type: git + location: https://github.com/jgm/commonmark-hs + tag: 530c6d93c9d7f84b1d71e10d23c1bfaee82e86bd + subdir: commonmark + +source-repository-package + type: git location: https://github.com/jgm/ipynb.git tag: 00246af10885c2ad4413ace4f69a7e6c88297a08 -source-repositiory-package +source-repository-package type: git location: https://github.com/jgm/citeproc.git tag: 81f8a77b7378f3e7305fb0ea1554e9a4726d4ade diff --git a/pandoc.cabal b/pandoc.cabal index 39bf2a860..4fd98243e 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -507,7 +507,7 @@ library tagsoup >= 0.14.6 && < 0.15, temporary >= 1.1 && < 1.4, texmath >= 0.12.3.2 && < 0.12.4, - text >= 1.1.1.0 && < 1.3, + text >= 1.1.1.0 && < 2.1, text-conversions >= 0.3 && < 0.4, time >= 1.5 && < 1.14, unicode-collation >= 0.1.1 && < 0.2, @@ -782,7 +782,7 @@ test-suite test-pandoc tasty-hunit >= 0.9 && < 0.11, tasty-lua >= 1.0 && < 1.1, tasty-quickcheck >= 0.8 && < 0.11, - text >= 1.1.1.0 && < 1.3, + text >= 1.1.1.0 && < 2.1, time >= 1.5 && < 1.14, xml >= 1.3.12 && < 1.4, zip-archive >= 0.2.3.4 && < 0.5 @@ -852,7 +852,7 @@ benchmark benchmark-pandoc build-depends: bytestring, tasty-bench >= 0.2 && <= 0.4, mtl >= 2.2 && < 2.3, - text >= 1.1.1.0 && < 1.3, + text >= 1.1.1.0 && < 2.1, deepseq -- we increase heap size to avoid benchmarking garbage collection: ghc-options: -rtsopts -with-rtsopts=-A8m -threaded diff --git a/stack.yaml b/stack.yaml index 218c550a0..763107d09 100644 --- a/stack.yaml +++ b/stack.yaml @@ -29,21 +29,23 @@ extra-deps: - tasty-lua-1.0.0 - pandoc-lua-marshal-0.1.3 - pandoc-types-1.22.1 -- commonmark-0.2.1.1 - aeson-pretty-0.8.9 - unicode-transforms-0.4.0 - unicode-data-0.2.0 - git: https://github.com/jgm/texmath.git - commit: 46df85d747f4f233157d3476683264232a4f58be + commit: 9a5b233a6a995b6b6d11051367984c76e457d9f7 - git: https://github.com/jgm/ipynb.git commit: 00246af10885c2ad4413ace4f69a7e6c88297a08 - git: https://github.com/jgm/citeproc.git commit: 81f8a77b7378f3e7305fb0ea1554e9a4726d4ade - git: https://github.com/jgm/commonmark-hs - commit: a60de5bb3d9905d0bc9d833e5df643f1130076b2 + commit: 530c6d93c9d7f84b1d71e10d23c1bfaee82e86bd + subdir: commonmark +- git: https://github.com/jgm/commonmark-hs + commit: 530c6d93c9d7f84b1d71e10d23c1bfaee82e86bd subdir: commonmark-pandoc - git: https://github.com/jgm/commonmark-hs - commit: a60de5bb3d9905d0bc9d833e5df643f1130076b2 + commit: 530c6d93c9d7f84b1d71e10d23c1bfaee82e86bd subdir: commonmark-extensions ghc-options: "$locals": -fhide-source-paths -Wno-missing-home-modules |