From b9036bede0937d41e90292dd5a2b124e696a7e2a Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 16 Dec 2020 09:53:27 -0800 Subject: [PATCH 1/2] disable prettyprinter-compat-annotated-wl-pprint for hledger/pretty-simple/prettyprinter (#5779) --- build-constraints.yaml | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 40211a04..15d14326 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1373,21 +1373,20 @@ packages: - uri-encode "Simon Michael @simonmichael": - # + - quickbench < 0 # via docopt + - regex-compat-tdfa + - shelltestrunner # The hledger project aims to keep the latest release of the core - # hledger-lib and hledger packages in stackage nightly at all times. - # When other hledger-* packages have too-restrictive bounds, we prefer they - # be removed, rather than putting an upper bound on hledger-lib and hledger. - # (https://github.com/fpco/stackage/issues/3494) - # + # "hledger-lib" and "hledger" packages in stackage nightly at all times. + # When other hledger-* packages (or minor non-hledger packages) have + # incompatible bounds, we would prefer they be disabled temporarily, + # rather than disabling the latest hledger-lib and hledger. + # (https://github.com/commercialhaskell/stackage/issues/3494, + # https://github.com/commercialhaskell/stackage/issues/5779) - hledger - hledger-lib - hledger-ui - hledger-web - # - - quickbench < 0 # via docopt - - regex-compat-tdfa - - shelltestrunner "Mihai Maruseac @mihaimaruseac": - io-manager @@ -5080,12 +5079,7 @@ packages: - persistent-typed-db < 0.1.0.2 # https://github.com/commercialhaskell/stackage/issues/5779 - - prettyprinter < 1.7.0 - - pretty-simple < 4 - - hledger-lib < 1.20 - - hledger < 1.20 - - hledger-ui < 1.20 - - hledger-web < 1.20 + - prettyprinter-compat-annotated-wl-pprint < 0 # https://github.com/commercialhaskell/stackage/issues/5780 - structured-cli < 2.7 @@ -6409,7 +6403,7 @@ no-revisions: - pantry - rio-prettyprint - hi-file-parser -# #3706: +# https://github.com/commercialhaskell/stackage/issues/3706: - hledger - hledger-lib - hledger-ui From 9e49d433418fa71df45fcf1681cf1834a64dfa3f Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Thu, 17 Dec 2020 15:31:18 -0500 Subject: [PATCH 2/2] move removal constraint --- build-constraints.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1951baae..8e8c5b0c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -524,7 +524,7 @@ packages: - prettyprinter-ansi-terminal - prettyprinter-compat-wl-pprint - prettyprinter-compat-ansi-wl-pprint - - prettyprinter-compat-annotated-wl-pprint + - prettyprinter-compat-annotated-wl-pprint < 0 # https://github.com/commercialhaskell/stackage/issues/5779 - prettyprinter-convert-ansi-wl-pprint "Joe M @joe9": @@ -5079,9 +5079,6 @@ packages: - persistent-test < 0 - persistent-typed-db < 0.1.0.2 - # https://github.com/commercialhaskell/stackage/issues/5779 - - prettyprinter-compat-annotated-wl-pprint < 0 - # https://github.com/commercialhaskell/stackage/issues/5780 - structured-cli < 2.7