From 971a31b4d88c1853b3b6b8de12d48332b25c5a11 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 21 May 2021 10:51:35 -0700 Subject: Bump upper-bounds for network-uri, time. Change stack.yaml to use lts-17.12. --- pandoc.cabal | 6 +++--- stack.yaml | 8 +------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pandoc.cabal b/pandoc.cabal index 66873a301..ec50d26f5 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -473,7 +473,7 @@ library jira-wiki-markup >= 1.3.4 && < 1.4, mtl >= 2.2 && < 2.3, network >= 2.6, - network-uri >= 2.6 && < 2.7, + network-uri >= 2.6 && < 2.8, pandoc-types >= 1.22 && < 1.23, parsec >= 3.1 && < 3.2, process >= 1.2.3 && < 1.7, @@ -489,7 +489,7 @@ library texmath >= 0.12.3 && < 0.12.4, text >= 1.1.1.0 && < 1.3, text-conversions >= 0.3 && < 0.4, - time >= 1.5 && < 1.10, + time >= 1.5 && < 1.12, unicode-transforms >= 0.3 && < 0.4, unordered-containers >= 0.2 && < 0.3, xml >= 1.3.12 && < 1.4, @@ -764,7 +764,7 @@ test-suite test-pandoc tasty-lua >= 0.2 && < 0.3, tasty-quickcheck >= 0.8 && < 0.11, text >= 1.1.1.0 && < 1.3, - time >= 1.5 && < 1.10, + time >= 1.5 && < 1.12, xml >= 1.3.12 && < 1.4, zip-archive >= 0.2.3.4 && < 0.5 other-modules: Tests.Old diff --git a/stack.yaml b/stack.yaml index 625543bf2..c67ff9986 100644 --- a/stack.yaml +++ b/stack.yaml @@ -9,17 +9,11 @@ packages: extra-deps: - hslua-1.3.0 - hslua-module-path-0.1.0 -- jira-wiki-markup-1.3.4 -- skylighting-core-0.10.5.1 -- skylighting-0.10.5.1 -- doclayout-0.3.0.2 - random-1.2.0 -- xml-conduit-1.9.1.1 - unicode-collation-0.1.3 -- texmath-0.12.3 - citeproc-0.4 ghc-options: "$locals": -fhide-source-paths -Wno-missing-home-modules -resolver: lts-17.5 +resolver: lts-17.12 nix: packages: [zlib] -- cgit v1.2.3