Merge branch 'master' into agda-2.6.3

This commit is contained in:
Chris Dornan 2023-02-05 16:38:16 +00:00 committed by GitHub
commit 34bb46c81d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2738,7 +2738,7 @@ packages:
- cheapskate
"Ivan Miljenovic <Ivan.Miljenovic@gmail.com> @ivan-m":
- fgl
- fgl <5.8.1.0 # https://github.com/commercialhaskell/stackage/issues/6878
- graphviz
- wl-pprint-text
- servant-pandoc
@ -7786,9 +7786,6 @@ packages:
# https://github.com/commercialhaskell/stackage/issues/6857
- deriving-trans < 0.6
# https://github.com/commercialhaskell/stackage/issues/6865
- shelly < 1.11
# end of packages
# Package flags are applied to individual packages, and override the values of
@ -8197,6 +8194,7 @@ skipped-tests:
- horizontal-rule # tried horizontal-rule-0.5.0.0, but its *test-suite* requires the disabled package: HMock
- hsdev # tried hsdev-0.3.4.0, but its *test-suite* requires lens-aeson >=1.0 && < 1.2 and the snapshot contains lens-aeson-1.2.2
- hspec-tables # tried hspec-tables-0.0.1, but its *test-suite* requires hspec ==2.7.* and the snapshot contains hspec-2.10.8
- http-io-streams # tests have snap dependency as of 0.1.6.2
- http-media # tried http-media-0.8.0.0, but its *test-suite* requires QuickCheck >=2.8 && < 2.14 and the snapshot contains QuickCheck-2.14.2
- http-media # tried http-media-0.8.0.0, but its *test-suite* requires base >=4.7 && < 4.13 and the snapshot contains base-4.17.0.0
- http-streams # tried http-streams-0.8.9.6, but its *test-suite* requires the disabled package: snap-server