Merge branch 'master' into master

This commit is contained in:
Jens Petersen 2023-09-29 15:59:03 +08:00 committed by GitHub
commit 7058b20751
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5254,6 +5254,12 @@ packages:
"Logan McGrath <logan.mcgrath@thisfieldwas.green> @keywordsalad":
- hakyllbars
"David Sánchez <davidslt+stackage@pm.me> @DavSanchez":
- richenv
"Zac Slade <krakrjak@gmail.com> @krakrjak":
- fits-parse
"Grandfathered dependencies":
- BiobaseNewick
- Boolean
@ -7192,7 +7198,6 @@ packages:
- language-python < 0 # tried language-python-0.5.8, but its *library* requires transformers >=0.3 && < 0.6 and the snapshot contains transformers-0.6.1.0
- language-thrift < 0 # tried language-thrift-0.12.0.1, but its *library* requires ansi-wl-pprint ==0.6.* and the snapshot contains ansi-wl-pprint-1.0.2
- large-hashable < 0 # tried large-hashable-0.1.0.4, but its *library* requires template-haskell < 2.15 and the snapshot contains template-haskell-2.20.0.0
- learn-physics < 0 # tried learn-physics-0.6.5, but its *library* requires the disabled package: spatial-math
- lens-accelerate < 0 # tried lens-accelerate-0.3.0.0, but its *library* requires lens ==4.* and the snapshot contains lens-5.2.3
- lens-datetime < 0 # tried lens-datetime-0.3, but its *library* requires lens >=3 && < 5 and the snapshot contains lens-5.2.3
- lens-family-th < 0 # tried lens-family-th-0.5.2.1, but its *library* requires template-haskell >=2.11 && < 2.19 and the snapshot contains template-haskell-2.20.0.0
@ -8289,6 +8294,8 @@ packages:
# https://github.com/commercialhaskell/stackage/issues/7124
- mpi-hs < 0.7.3
# https://github.com/commercialhaskell/stackage/issues/7129
- lpeg < 1.1
# end of Stackage upper bounds
# end of packages
@ -9172,7 +9179,6 @@ expected-test-failures:
- character-cases # 0.1.0.6 https://github.com/aiya000/hs-character-cases/issues/3
- codec-beam # 0.2.0 posix_spawnp: does not exist
- colonnade # 1.2.0.2 https://github.com/andrewthad/colonnade/issues/31
- context-wai-middleware # 0.2.0.1 https://github.com/jship/context/issues/3
- control-dsl # 0.2.1.3
- crypt-sha512 # 0 Use -p '/crypt.$6$rounds=10$roundstoolow/' to rerun this test only.
- curl-runnings # 0.17.0