Merge branch 'master' of https://github.com/simonmichael/stackage into simonmichael-master

This commit is contained in:
Dan Burton 2020-12-17 15:25:45 -05:00
commit 72468541b3
No known key found for this signature in database
GPG Key ID: 41F154F410EC12E0

View File

@ -1374,21 +1374,20 @@ packages:
- uri-encode - uri-encode
"Simon Michael <simon@joyful.com> @simonmichael": "Simon Michael <simon@joyful.com> @simonmichael":
# - quickbench < 0 # via docopt
- regex-compat-tdfa
- shelltestrunner
# The hledger project aims to keep the latest release of the core # The hledger project aims to keep the latest release of the core
# hledger-lib and hledger packages in stackage nightly at all times. # "hledger-lib" and "hledger" packages in stackage nightly at all times.
# When other hledger-* packages have too-restrictive bounds, we prefer they # When other hledger-* packages (or minor non-hledger packages) have
# be removed, rather than putting an upper bound on hledger-lib and hledger. # incompatible bounds, we would prefer they be disabled temporarily,
# (https://github.com/fpco/stackage/issues/3494) # 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
- hledger-lib - hledger-lib
- hledger-ui - hledger-ui
- hledger-web - hledger-web
#
- quickbench < 0 # via docopt
- regex-compat-tdfa
- shelltestrunner
"Mihai Maruseac <mihai.maruseac@gmail.com> @mihaimaruseac": "Mihai Maruseac <mihai.maruseac@gmail.com> @mihaimaruseac":
- io-manager - io-manager
@ -5081,12 +5080,7 @@ packages:
- persistent-typed-db < 0.1.0.2 - persistent-typed-db < 0.1.0.2
# https://github.com/commercialhaskell/stackage/issues/5779 # https://github.com/commercialhaskell/stackage/issues/5779
- prettyprinter < 1.7.0 - prettyprinter-compat-annotated-wl-pprint < 0
- pretty-simple < 4
- hledger-lib < 1.20
- hledger < 1.20
- hledger-ui < 1.20
- hledger-web < 1.20
# https://github.com/commercialhaskell/stackage/issues/5780 # https://github.com/commercialhaskell/stackage/issues/5780
- structured-cli < 2.7 - structured-cli < 2.7
@ -6410,7 +6404,7 @@ no-revisions:
- pantry - pantry
- rio-prettyprint - rio-prettyprint
- hi-file-parser - hi-file-parser
# #3706: # https://github.com/commercialhaskell/stackage/issues/3706:
- hledger - hledger
- hledger-lib - hledger-lib
- hledger-ui - hledger-ui