Merge branch 'master' into master

This commit is contained in:
Joe Kachmar 2020-05-22 14:37:20 -04:00 committed by GitHub
commit 634066e73a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -12,6 +12,9 @@ packages:
"Christian Charukiewicz <c.charukiewicz@gmail.com> @charukiewicz": "Christian Charukiewicz <c.charukiewicz@gmail.com> @charukiewicz":
- isbn - isbn
"Koz Ross <koz.ross@retro-freedom.nz> @kozross":
- medea
"Ashlynn Anderson <maintainer@pea.sh> @lambdadog": "Ashlynn Anderson <maintainer@pea.sh> @lambdadog":
- proto3-wire - proto3-wire
@ -86,7 +89,7 @@ packages:
"Robert Vollmert <rob@vllmrt.net> @robx": "Robert Vollmert <rob@vllmrt.net> @robx":
- configurator-pg - configurator-pg
- postgrest - postgrest < 7.0.1 # https://github.com/commercialhaskell/stackage/issues/5383
"Sandy Maguire <sandy@sandymaguire.me> @isovector": "Sandy Maguire <sandy@sandymaguire.me> @isovector":
- ecstasy - ecstasy
@ -478,7 +481,7 @@ packages:
- type-map - type-map
"Tobias Dammers <tdammers@gmail.com> @tdammers": "Tobias Dammers <tdammers@gmail.com> @tdammers":
- ginger < 0 # via regex-tdfa-1.3.0 - ginger
- yeshql < 0 # via yeshql-hdbc - yeshql < 0 # via yeshql-hdbc
"Yair Chuchem <yairchu@gmail.com> @yairchu": "Yair Chuchem <yairchu@gmail.com> @yairchu":
@ -1220,6 +1223,7 @@ packages:
"Colin Woodbury <colin@fosskers.ca> @fosskers": "Colin Woodbury <colin@fosskers.ca> @fosskers":
- aur - aur
- aura
- bounded-queue - bounded-queue
- kanji - kanji
- language-bash - language-bash
@ -3266,7 +3270,7 @@ packages:
- validation - validation
"Tony Day <tonyday567@gmail.com> @tonyday567": "Tony Day <tonyday567@gmail.com> @tonyday567":
- numhask - numhask < 0.5 # https://github.com/commercialhaskell/stackage/issues/5382
- numhask-array < 0 - numhask-array < 0
- numhask-prelude < 0 - numhask-prelude < 0
- numhask-space < 0 - numhask-space < 0
@ -3625,7 +3629,7 @@ packages:
- ilist - ilist
- life-sync - life-sync
- membrain - membrain
- relude < 0.7 # https://github.com/commercialhaskell/stackage/issues/5361 - relude
- shellmet - shellmet
- shortcut-links - shortcut-links
- summoner - summoner
@ -3868,11 +3872,11 @@ packages:
- map-syntax < 0 # GHC 8.4 via base-4.11.0.0 - map-syntax < 0 # GHC 8.4 via base-4.11.0.0
- heist < 0 # GHC 8.4 via map-syntax - heist < 0 # GHC 8.4 via map-syntax
- snap < 0 # GHC 8.4 via base-4.11.0.0 - snap < 0 # GHC 8.4 via base-4.11.0.0
- conferer < 0.4.0.0 # https://github.com/commercialhaskell/stackage/issues/5374 - conferer
# - conferer-snap # Because snap #- conferer-snap # Because snap
- conferer-warp < 0.4.0.0 # https://github.com/commercialhaskell/stackage/issues/5374 - conferer-warp
- conferer-hspec < 0.4.0.0 # https://github.com/commercialhaskell/stackage/issues/5374 - conferer-hspec
- conferer-provider-json - conferer-source-json
"Tim Humphries <tim+stackage@utf8.me> @thumphries": "Tim Humphries <tim+stackage@utf8.me> @thumphries":
- transformers-either < 0 # via exceptions-0.10.0 - transformers-either < 0 # via exceptions-0.10.0
@ -4176,6 +4180,7 @@ packages:
"Davit Nalchevanidze <d.nalchevanidze@gmail.com> @nalchevanidze": "Davit Nalchevanidze <d.nalchevanidze@gmail.com> @nalchevanidze":
- morpheus-graphql - morpheus-graphql
- morpheus-graphql-core
"Satoshi Egi <egi@egison.org> @egisatoshi": "Satoshi Egi <egi@egison.org> @egisatoshi":
- egison - egison
@ -4821,15 +4826,9 @@ packages:
# https://github.com/commercialhaskell/stackage/issues/5335 # https://github.com/commercialhaskell/stackage/issues/5335
- brick <0.53 - brick <0.53
# https://github.com/commercialhaskell/stackage/issues/5336
- colourista < 0.1.0.0
# https://github.com/commercialhaskell/stackage/issues/5347 # https://github.com/commercialhaskell/stackage/issues/5347
- persistent-template < 2.8.3 - persistent-template < 2.8.3
# https://github.com/commercialhaskell/stackage/issues/5346
- validation-selective < 0.1.0.0
# https://github.com/commercialhaskell/stackage/issues/5348 # https://github.com/commercialhaskell/stackage/issues/5348
- tasty < 1.3 - tasty < 1.3
- tasty-golden < 2.3.3.3 - tasty-golden < 2.3.3.3