Merge branch 'master' into patch-9

This commit is contained in:
Jens Petersen 2019-10-04 09:24:27 +08:00 committed by GitHub
commit f182442aa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4334,6 +4334,7 @@ packages:
- skein - skein
- skylighting-core - skylighting-core
- snap-core - snap-core
- some
- special-values - special-values
- splice - splice
- split - split
@ -4403,6 +4404,7 @@ packages:
- unbounded-delays - unbounded-delays
- universe - universe
- universe-base - universe-base
- universe-some
- universe-dependent-sum - universe-dependent-sum
- universe-instances-base - universe-instances-base
- universe-instances-extended - universe-instances-extended
@ -4678,7 +4680,6 @@ packages:
- active < 0 # via base-4.13.0.0 - active < 0 # via base-4.13.0.0
- aeson-diff < 0 # via base-4.13.0.0 - aeson-diff < 0 # via base-4.13.0.0
- alarmclock < 0 # via base-4.13.0.0 - alarmclock < 0 # via base-4.13.0.0
- asn1-encoding < 0 # via base-4.13.0.0
- autoexporter < 0 # via base-4.13.0.0 - autoexporter < 0 # via base-4.13.0.0
- bank-holidays-england < 0 # via base-4.13.0.0 - bank-holidays-england < 0 # via base-4.13.0.0
- base-noprelude < 0 # via base-4.13.0.0 - base-noprelude < 0 # via base-4.13.0.0
@ -4746,7 +4747,6 @@ packages:
- hledger-ui < 0 # via base-4.13.0.0 - hledger-ui < 0 # via base-4.13.0.0
- hledger-web < 0 # via base-4.13.0.0 - hledger-web < 0 # via base-4.13.0.0
- hspec-need-env < 0 # via base-4.13.0.0 - hspec-need-env < 0 # via base-4.13.0.0
- http-media < 0 # via base-4.13.0.0
- hyper < 0 # via base-4.13.0.0 - hyper < 0 # via base-4.13.0.0
- ihaskell < 0 # via base-4.13.0.0 - ihaskell < 0 # via base-4.13.0.0
- indentation-core < 0 # via base-4.13.0.0 - indentation-core < 0 # via base-4.13.0.0
@ -4789,7 +4789,6 @@ packages:
- rhine < 0 # via base-4.13.0.0 - rhine < 0 # via base-4.13.0.0
- rhine-gloss < 0 # via base-4.13.0.0 - rhine-gloss < 0 # via base-4.13.0.0
- salve < 0 # via base-4.13.0.0 - salve < 0 # via base-4.13.0.0
- servant-JuicyPixels < 0 # via base-4.13.0.0
- servant-auth < 0 # via base-4.13.0.0 - servant-auth < 0 # via base-4.13.0.0
- servant-auth-client < 0 # via base-4.13.0.0 - servant-auth-client < 0 # via base-4.13.0.0
- servant-auth-docs < 0 # via base-4.13.0.0 - servant-auth-docs < 0 # via base-4.13.0.0
@ -4801,7 +4800,6 @@ packages:
- slack-web < 0 # via base-4.13.0.0 - slack-web < 0 # via base-4.13.0.0
- smallcheck-series < 0 # via base-4.13.0.0 - smallcheck-series < 0 # via base-4.13.0.0
- snap-server < 0 # via base-4.13.0.0 - snap-server < 0 # via base-4.13.0.0
- socks < 0 # via base-4.13.0.0
- sqlite-simple < 0 # via base-4.13.0.0 - sqlite-simple < 0 # via base-4.13.0.0
- statestack < 0 # via base-4.13.0.0 - statestack < 0 # via base-4.13.0.0
- strive < 0 # via base-4.13.0.0 - strive < 0 # via base-4.13.0.0
@ -4990,8 +4988,6 @@ packages:
- wild-bind-x11 < 0 # via time-1.9.3 - wild-bind-x11 < 0 # via time-1.9.3
- ztail < 0 # via time-1.9.3 - ztail < 0 # via time-1.9.3
- mysql-haskell < 0 # via tls-1.5.1 - mysql-haskell < 0 # via tls-1.5.1
- universe < 0 # via universe-some
- universe-dependent-sum < 0 # via universe-some
- MissingH < 0 # via unix-2.7.2.2 - MissingH < 0 # via unix-2.7.2.2
- beam-core < 0 # via vector-sized-1.4.0.0 - beam-core < 0 # via vector-sized-1.4.0.0
- beam-mysql < 0 # via beam-core - beam-mysql < 0 # via beam-core
@ -5022,27 +5018,21 @@ packages:
- file-modules < 0 # via MissingH - file-modules < 0 # via MissingH
- hadolint < 0 # via ShellCheck - hadolint < 0 # via ShellCheck
- ipynb < 0 # via aeson-diff - ipynb < 0 # via aeson-diff
- asn1-parse < 0 # via asn1-encoding
- aws-cloudfront-signed-cookies < 0 # via asn1-encoding - aws-cloudfront-signed-cookies < 0 # via asn1-encoding
- crypto-pubkey-openssh < 0 # via asn1-encoding - crypto-pubkey-openssh < 0 # via asn1-encoding
- crypto-pubkey-types < 0 # via asn1-encoding - crypto-pubkey-types < 0 # via asn1-encoding
- pkcs10 < 0 # via asn1-encoding - pkcs10 < 0 # via asn1-encoding
- x509 < 0 # via asn1-encoding
- x509-store < 0 # via asn1-encoding
- x509-validation < 0 # via asn1-encoding
- avers-api < 0 # via servant - avers-api < 0 # via servant
- fib < 0 # via base-noprelude - fib < 0 # via base-noprelude
- bencoding < 0 # via bencode - bencoding < 0 # via bencode
- Chart-diagrams < 0 # via blaze-markup - Chart-diagrams < 0 # via blaze-markup
- SVGFonts < 0 # via blaze-markup - SVGFonts < 0 # via blaze-markup
- ace < 0 # via blaze-markup - ace < 0 # via blaze-markup
- blaze-html < 0 # via blaze-markup
- blaze-svg < 0 # via blaze-markup - blaze-svg < 0 # via blaze-markup
- heterocephalus < 0 # via blaze-markup - heterocephalus < 0 # via blaze-markup
- hoogle < 0 # via blaze-markup - hoogle < 0 # via blaze-markup
- markdown < 0 # via blaze-markup - markdown < 0 # via blaze-markup
- plotlyhs < 0 # via blaze-markup - plotlyhs < 0 # via blaze-markup
- servant-swagger-ui-core < 0 # via blaze-markup
- shakespeare < 0 # via blaze-markup - shakespeare < 0 # via blaze-markup
- trifecta < 0 # via blaze-markup - trifecta < 0 # via blaze-markup
- xml-conduit < 0 # via blaze-markup - xml-conduit < 0 # via blaze-markup
@ -5163,23 +5153,10 @@ packages:
- yesod-fb < 0 # via http-conduit - yesod-fb < 0 # via http-conduit
- yesod-recaptcha2 < 0 # via http-conduit - yesod-recaptcha2 < 0 # via http-conduit
- cachix-api < 0 # via http-media - cachix-api < 0 # via http-media
- servant < 0 # via http-media
- servant-blaze < 0 # via http-media
- servant-cassava < 0 # via http-media
- servant-checked-exceptions-core < 0 # via http-media - servant-checked-exceptions-core < 0 # via http-media
- servant-client < 0 # via http-media
- servant-client-core < 0 # via http-media
- servant-conduit < 0 # via http-media
- servant-docs < 0 # via http-media
- servant-lucid < 0 # via http-media
- servant-machines < 0 # via http-media
- servant-pipes < 0 # via http-media
- servant-rawm < 0 # via http-media - servant-rawm < 0 # via http-media
- servant-static-th < 0 # via http-media - servant-static-th < 0 # via http-media
- servant-swagger < 0 # via http-media
- servant-swagger-ui-core < 0 # via http-media
- servant-xml < 0 # via http-media - servant-xml < 0 # via http-media
- servant-yaml < 0 # via http-media
- wai-middleware-auth < 0 # via http-reverse-proxy - wai-middleware-auth < 0 # via http-reverse-proxy
- ses-html < 0 # via http-streams - ses-html < 0 # via http-streams
- board-games < 0 # via httpd-shed - board-games < 0 # via httpd-shed
@ -5267,19 +5244,9 @@ packages:
- servant-auth-wordpress < 0 # via servant-server - servant-auth-wordpress < 0 # via servant-server
- servant-checked-exceptions < 0 # via servant-server - servant-checked-exceptions < 0 # via servant-server
- servant-cli < 0 # via servant-server - servant-cli < 0 # via servant-server
- servant-conduit < 0 # via servant-server
- servant-js < 0 # via servant-server
- servant-lucid < 0 # via servant-server
- servant-machines < 0 # via servant-server
- servant-mock < 0 # via servant-server
- servant-pipes < 0 # via servant-server
- servant-rawm < 0 # via servant-server - servant-rawm < 0 # via servant-server
- servant-static-th < 0 # via servant-server - servant-static-th < 0 # via servant-server
- servant-swagger-ui < 0 # via servant-server
- servant-swagger-ui-core < 0 # via servant-server
- servant-swagger-ui-redoc < 0 # via servant-server
- servant-tracing < 0 # via servant-server - servant-tracing < 0 # via servant-server
- servant-yaml < 0 # via servant-server
- tonatona-servant < 0 # via servant-server - tonatona-servant < 0 # via servant-server
- testing-feat < 0 # via size-based - testing-feat < 0 # via size-based
- gingersnap < 0 # via snap-core - gingersnap < 0 # via snap-core
@ -5298,10 +5265,6 @@ packages:
- sv-cassava < 0 # via sv-core - sv-cassava < 0 # via sv-core
- Chart-diagrams < 0 # via svg-builder - Chart-diagrams < 0 # via svg-builder
- cachix-api < 0 # via swagger2 - cachix-api < 0 # via swagger2
- servant-swagger < 0 # via swagger2
- servant-swagger-ui < 0 # via swagger2
- servant-swagger-ui-core < 0 # via swagger2
- servant-swagger-ui-redoc < 0 # via swagger2
- hspec-pg-transact < 0 # via tmp-postgres - hspec-pg-transact < 0 # via tmp-postgres
- pg-transact < 0 # via tmp-postgres - pg-transact < 0 # via tmp-postgres
- salak-toml < 0 # via tomland - salak-toml < 0 # via tomland
@ -5316,7 +5279,6 @@ packages:
- hamilton < 0 # via vty - hamilton < 0 # via vty
- hledger-iadd < 0 # via vty - hledger-iadd < 0 # via vty
- servant-rawm < 0 # via wai-app-static - servant-rawm < 0 # via wai-app-static
- servant-swagger-ui-core < 0 # via wai-app-static
- servius < 0 # via wai-app-static - servius < 0 # via wai-app-static
- wai-middleware-auth < 0 # via wai-app-static - wai-middleware-auth < 0 # via wai-app-static
- yesod-static < 0 # via wai-app-static - yesod-static < 0 # via wai-app-static
@ -5403,9 +5365,6 @@ packages:
- template-toolkit < 0 # via regex-pcre-builtin - template-toolkit < 0 # via regex-pcre-builtin
- dl-fedora < 0 # via regex-posix - dl-fedora < 0 # via regex-posix
- inline-c < 0 # via regex-posix - inline-c < 0 # via regex-posix
- language-haskell-extract < 0 # via regex-posix
- test-framework < 0 # via regex-posix
- test-framework-th < 0 # via regex-posix
- xml-to-json < 0 # via regex-posix - xml-to-json < 0 # via regex-posix
- cabal-debian < 0 # via regex-tdfa - cabal-debian < 0 # via regex-tdfa
- haskell-gi < 0 # via regex-tdfa - haskell-gi < 0 # via regex-tdfa
@ -5416,7 +5375,6 @@ packages:
- relational-record < 0 # via relational-query-HDBC - relational-record < 0 # via relational-query-HDBC
- wikicfp-scraper < 0 # via scalpel-core - wikicfp-scraper < 0 # via scalpel-core
- miso < 0 # via servant - miso < 0 # via servant
- servant-foreign < 0 # via servant
- miso < 0 # via servant-lucid - miso < 0 # via servant-lucid
- state-codes < 0 # via shakespeare - state-codes < 0 # via shakespeare
- xml-hamlet < 0 # via shakespeare - xml-hamlet < 0 # via shakespeare
@ -5425,9 +5383,7 @@ packages:
- stripe-wreq < 0 # via wreq - stripe-wreq < 0 # via wreq
- jose < 0 # via x509 - jose < 0 # via x509
- jwt < 0 # via x509 - jwt < 0 # via x509
- x509-system < 0 # via x509
- jwt < 0 # via x509-store - jwt < 0 # via x509-store
- x509-system < 0 # via x509-store
- haskell-gi < 0 # via xml-conduit - haskell-gi < 0 # via xml-conduit
- xlsx < 0 # via xml-conduit - xlsx < 0 # via xml-conduit
- xml-conduit-parse < 0 # via xml-conduit - xml-conduit-parse < 0 # via xml-conduit
@ -5523,9 +5479,7 @@ packages:
- abstract-deque-tests < 0 # via test-framework - abstract-deque-tests < 0 # via test-framework
- crypto-api-tests < 0 # via test-framework - crypto-api-tests < 0 # via test-framework
- crypto-cipher-tests < 0 # via test-framework - crypto-cipher-tests < 0 # via test-framework
- test-framework-hunit < 0 # via test-framework
- test-framework-leancheck < 0 # via test-framework - test-framework-leancheck < 0 # via test-framework
- test-framework-quickcheck2 < 0 # via test-framework
- test-framework-smallcheck < 0 # via test-framework - test-framework-smallcheck < 0 # via test-framework
- tonatona < 0 # via tonaparser - tonatona < 0 # via tonaparser
- tonatona-logger < 0 # via tonaparser - tonatona-logger < 0 # via tonaparser
@ -5576,15 +5530,12 @@ packages:
- tcp-streams-openssl < 0 # via HsOpenSSL-x509-system - tcp-streams-openssl < 0 # via HsOpenSSL-x509-system
- pandoc-citeproc < 0 # via HsYAML-aeson - pandoc-citeproc < 0 # via HsYAML-aeson
- hOpenPGP < 0 # via asn1-encoding - hOpenPGP < 0 # via asn1-encoding
- tls < 0 # via asn1-encoding
- ws < 0 # via attoparsec-uri - ws < 0 # via attoparsec-uri
- microformats2-parser < 0 # via blaze-html - microformats2-parser < 0 # via blaze-html
- persistent-mongoDB < 0 # via blaze-html - persistent-mongoDB < 0 # via blaze-html
- wai-app-static < 0 # via blaze-html
- yesod-core < 0 # via blaze-html - yesod-core < 0 # via blaze-html
- yesod-test < 0 # via blaze-html - yesod-test < 0 # via blaze-html
- microformats2-parser < 0 # via blaze-markup - microformats2-parser < 0 # via blaze-markup
- wai-app-static < 0 # via blaze-markup
- yesod-core < 0 # via blaze-markup - yesod-core < 0 # via blaze-markup
- hOpenPGP < 0 # via bzlib - hOpenPGP < 0 # via bzlib
- xml-lens < 0 # via case-insensitive-1.2.1.0 - xml-lens < 0 # via case-insensitive-1.2.1.0
@ -5600,10 +5551,6 @@ packages:
- microformats2-parser < 0 # via html-conduit - microformats2-parser < 0 # via html-conduit
- yesod-test < 0 # via html-conduit - yesod-test < 0 # via html-conduit
- pantry < 0 # via http-download - pantry < 0 # via http-download
- servant-http-streams < 0 # via http-media
- servant-multipart < 0 # via http-media
- servant-server < 0 # via http-media
- swagger2 < 0 # via http-media
- asif < 0 # via hw-hspec-hedgehog - asif < 0 # via hw-hspec-hedgehog
- asif < 0 # via hw-ip - asif < 0 # via hw-ip
- hOpenPGP < 0 # via incremental-parser - hOpenPGP < 0 # via incremental-parser
@ -5647,13 +5594,11 @@ packages:
- haskoin-core < 0 # via secp256k1-haskell - haskoin-core < 0 # via secp256k1-haskell
- servant-http-streams < 0 # via servant - servant-http-streams < 0 # via servant
- servant-multipart < 0 # via servant - servant-multipart < 0 # via servant
- servant-server < 0 # via servant
- servant-http-streams < 0 # via servant-client-core - servant-http-streams < 0 # via servant-client-core
- servant-multipart < 0 # via servant-docs - servant-multipart < 0 # via servant-docs
- servant-multipart < 0 # via servant-foreign - servant-multipart < 0 # via servant-foreign
- yesod-bin < 0 # via shakespeare - yesod-bin < 0 # via shakespeare
- yesod-core < 0 # via shakespeare - yesod-core < 0 # via shakespeare
- connection < 0 # via socks
- network-simple < 0 # via socks - network-simple < 0 # via socks
- store < 0 # via store-core - store < 0 # via store-core
- pantry < 0 # via tar-conduit - pantry < 0 # via tar-conduit
@ -5690,28 +5635,17 @@ packages:
- vivid < 0 # via vivid-supercollider - vivid < 0 # via vivid-supercollider
- web-routes-wai < 0 # via web-routes - web-routes-wai < 0 # via web-routes
- ws < 0 # via wuss - ws < 0 # via wuss
- connection < 0 # via x509
- network-simple-tls < 0 # via x509 - network-simple-tls < 0 # via x509
- postgresql-typed < 0 # via x509 - postgresql-typed < 0 # via x509
- tcp-streams < 0 # via x509 - tcp-streams < 0 # via x509
- tls < 0 # via x509
- tls-debug < 0 # via x509
- warp-tls-uid < 0 # via x509 - warp-tls-uid < 0 # via x509
- connection < 0 # via x509-store
- network-simple-tls < 0 # via x509-store - network-simple-tls < 0 # via x509-store
- postgresql-typed < 0 # via x509-store - postgresql-typed < 0 # via x509-store
- tcp-streams < 0 # via x509-store - tcp-streams < 0 # via x509-store
- tls < 0 # via x509-store
- tls-debug < 0 # via x509-store
- connection < 0 # via x509-system
- network-simple-tls < 0 # via x509-system - network-simple-tls < 0 # via x509-system
- tcp-streams < 0 # via x509-system - tcp-streams < 0 # via x509-system
- tls-debug < 0 # via x509-system
- connection < 0 # via x509-validation
- network-simple-tls < 0 # via x509-validation - network-simple-tls < 0 # via x509-validation
- postgresql-typed < 0 # via x509-validation - postgresql-typed < 0 # via x509-validation
- tls < 0 # via x509-validation
- tls-debug < 0 # via x509-validation
- DAV < 0 # via xml-conduit - DAV < 0 # via xml-conduit
- pandoc-citeproc < 0 # via xml-conduit - pandoc-citeproc < 0 # via xml-conduit
- xml-lens < 0 # via xml-conduit - xml-lens < 0 # via xml-conduit
@ -5720,7 +5654,6 @@ packages:
- HandsomeSoup < 0 # via HTTP - HandsomeSoup < 0 # via HTTP
- hxt-http < 0 # via HTTP - hxt-http < 0 # via HTTP
- amqp < 0 # via connection - amqp < 0 # via connection
- http-client-tls < 0 # via connection
- http-conduit < 0 # via connection - http-conduit < 0 # via connection
- network-conduit-tls < 0 # via connection - network-conduit-tls < 0 # via connection
- http-streams < 0 # via io-streams - http-streams < 0 # via io-streams
@ -5731,10 +5664,8 @@ packages:
- pipes-network-tls < 0 # via network-simple - pipes-network-tls < 0 # via network-simple
- pipes-network-tls < 0 # via network-simple-tls - pipes-network-tls < 0 # via network-simple-tls
- http-streams < 0 # via openssl-streams - http-streams < 0 # via openssl-streams
- http-client-tls < 0 # via tls
- network-conduit-tls < 0 # via tls - network-conduit-tls < 0 # via tls
- pipes-network-tls < 0 # via tls - pipes-network-tls < 0 # via tls
- tls-session-manager < 0 # via tls
- warp-tls < 0 # via tls - warp-tls < 0 # via tls
- wai-websockets < 0 # via wai-app-static - wai-websockets < 0 # via wai-app-static
- wai-session-postgresql < 0 # via wai-session - wai-session-postgresql < 0 # via wai-session
@ -6060,6 +5991,7 @@ skipped-tests:
# These can periodically be checked for updates; # These can periodically be checked for updates;
# just remove these lines and run `stackage-curator check' to verify. # just remove these lines and run `stackage-curator check' to verify.
- time-compat # base-compat 0.11 - time-compat # base-compat 0.11
- http-media # base-4.13
# fails with ghc 8.8 # fails with ghc 8.8
- alex # as of alex-3.2.4 - alex # as of alex-3.2.4
@ -6708,6 +6640,8 @@ expected-test-failures:
# https://github.com/commercialhaskell/stackage/issues/4810 # https://github.com/commercialhaskell/stackage/issues/4810
- dns - dns
# https://github.com/alanz/ghc-exactprint/issues/82
- ghc-exactprint
# end of expected-test-failures # end of expected-test-failures
# Benchmarks which are known not to build. Note that, currently we do not run # Benchmarks which are known not to build. Note that, currently we do not run