Merge remote-tracking branch 'origin/master' into ghc-9.2

This commit is contained in:
Adam Bergmark 2021-12-20 01:13:36 +01:00
commit 10ee1ecc57

View File

@ -1424,7 +1424,6 @@ packages:
"Silk <code@silk.co>":
- attoparsec-expr
- generic-xmlpickler
- hxt-pickle-utils
- imagesize-conduit
- multipart
- tostring
@ -6193,8 +6192,6 @@ packages:
- fast-builder < 0 # tried fast-builder-0.1.3.0, but its *library* does not support: base-4.16.0.0
- fasta < 0 # tried fasta-0.10.4.2, but its *library* requires the disabled package: pipes-text
- fb < 0 # tried fb-2.1.1, but its *library* requires the disabled package: memory
- fclabels < 0 # tried fclabels-2.0.5.1, but its *library* does not support: base-4.16.0.0
- fclabels < 0 # tried fclabels-2.0.5.1, but its *library* does not support: template-haskell-2.18.0.0
- fft < 0 # tried fft-0.1.8.7, but its *library* requires the disabled package: carray
- fib < 0 # tried fib-0.1.0.1, but its *library* requires the disabled package: base-noprelude
- file-embed-lzma < 0 # tried file-embed-lzma-0, but its *library* does not support: base-4.16.0.0
@ -6613,7 +6610,6 @@ packages:
- hw-succinct < 0 # tried hw-succinct-0.1.0.1, but its *library* requires the disabled package: hw-prim
- hw-xml < 0 # tried hw-xml-0.5.1.0, but its *library* does not support: ghc-prim-0.8.0
- hworker < 0 # tried hworker-0.1.0.1, but its *library* requires the disabled package: hedis
- hxt-pickle-utils < 0 # tried hxt-pickle-utils-0.1.0.3, but its *library* does not support: base-4.16.0.0
- hyper < 0 # tried hyper-0.2.1.1, but its *library* does not support: base-4.16.0.0
- hyperloglog < 0 # tried hyperloglog-0.4.5, but its *library* requires the disabled package: siphash
- hyraxAbif < 0 # tried hyraxAbif-0.2.3.27, but its *library* does not support: bytestring-0.11.1.0
@ -7457,8 +7453,7 @@ packages:
- servant-swagger-ui-redoc < 0 # tried servant-swagger-ui-redoc-0.3.4.1.22.3, but its *library* does not support: aeson-2.0.2.0
- servant-swagger-ui-redoc < 0 # tried servant-swagger-ui-redoc-0.3.4.1.22.3, but its *library* does not support: base-4.16.0.0
- servant-swagger-ui-redoc < 0 # tried servant-swagger-ui-redoc-0.3.4.1.22.3, but its *library* does not support: bytestring-0.11.1.0
- servant-tracing < 0 # tried servant-tracing-0.1.0.2, but its *library* requires the disabled package: servant
- servant-tracing < 0 # tried servant-tracing-0.1.0.2, but its *library* requires the disabled package: servant-server
- servant-tracing < 0 # tried servant-tracing-0.2.0.0, but its *library* requires the disabled package: servant
- servant-websockets < 0 # tried servant-websockets-2.0.0, but its *library* requires the disabled package: servant-server
- servant-xml < 0 # tried servant-xml-1.0.1.4, but its *library* requires the disabled package: servant
- servant-yaml < 0 # tried servant-yaml-0.1.0.1, but its *library* does not support: base-4.16.0.0
@ -7479,7 +7474,6 @@ packages:
- sexpr-parser < 0 # tried sexpr-parser-0.2.0.0, but its *executable* does not support: bytestring-0.11.1.0
- sexpr-parser < 0 # tried sexpr-parser-0.2.0.0, but its *library* does not support: base-4.16.0.0
- sexpr-parser < 0 # tried sexpr-parser-0.2.0.0, but its *library* does not support: megaparsec-9.2.0
- shake-language-c < 0 # tried shake-language-c-0.12.0, but its *library* requires the disabled package: fclabels
- shake-plus < 0 # tried shake-plus-0.3.4.0, but its *library* requires the disabled package: path
- shake-plus-extended < 0 # tried shake-plus-extended-0.4.1.0, but its *library* requires the disabled package: ixset-typed
- shake-plus-extended < 0 # tried shake-plus-extended-0.4.1.0, but its *library* requires the disabled package: path
@ -7989,13 +7983,14 @@ packages:
- forma >= 1.2.0
- hruby >= 0.4.0.0
- hspec-expectations-json >= 1.0.0.5
- kanji > 3.5
- microlens-aeson >= 2.4
- mmark-cli >= 0.0.5.1
- postgresql-binary >= 0.12.4.2
- stache >= 2.3.1
- stripe-scotty >= 1.1.0.1
- stripe-wreq >= 1.0.1.12
- kanji > 3.5
- servant-tracing >= 0.2.0.0
# https://github.com/commercialhaskell/stackage/issues/6237
- lucid >= 2.11