Merge branch 'master' into add-new-library-sv

This commit is contained in:
Mihai Maruseac 2018-09-25 17:35:24 -07:00 committed by GitHub
commit 442fa3ce8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -10,7 +10,7 @@ packages:
"Andrew Newman <andrewfnewman@gmail.com> @andrewfnewman": "Andrew Newman <andrewfnewman@gmail.com> @andrewfnewman":
- geojson - geojson
"Mateusz Karbowy <mateusz.karbowy@gmail.com> @obszczymucha": "Mateusz Karbowy <mateusz.karbowy@gmail.com> @obszczymucha":
- parsec-numbers - parsec-numbers
@ -1307,7 +1307,7 @@ packages:
- xmlbf - xmlbf
"Tomas Carnecky @wereHamster": "Tomas Carnecky @wereHamster":
# - avers # cryptonite 0.25 - avers
# - avers-api # cryptonite 0.25 # - avers-api # cryptonite 0.25
# - avers-server # cryptonite 0.25 # - avers-server # cryptonite 0.25
- css-syntax - css-syntax
@ -3226,6 +3226,7 @@ packages:
"Luis Pedro Coelho <luis@luispedro.org> @luispedro": "Luis Pedro Coelho <luis@luispedro.org> @luispedro":
- safeio - safeio
- conduit-algorithms - conduit-algorithms
- conduit-zstd
"Alex Biehl <alexbiehl@gmail.com> @alexbiehl": "Alex Biehl <alexbiehl@gmail.com> @alexbiehl":
- haddock-library - haddock-library
@ -3757,6 +3758,9 @@ packages:
# https://github.com/commercialhaskell/stackage/issues/3990 # https://github.com/commercialhaskell/stackage/issues/3990
- stm < 2.5 - stm < 2.5
# https://github.com/commercialhaskell/stackage/issues/3997
- rhine < 0.5
# end of packages # end of packages
# Package flags are applied to individual packages, and override the values of # Package flags are applied to individual packages, and override the values of
@ -4370,6 +4374,7 @@ skipped-benchmarks:
- unicode-transforms # path-io - unicode-transforms # path-io
- unordered-containers # criterion 1.5 - unordered-containers # criterion 1.5
- xxhash-ffi # ghc 8.4 via xxhash build failure - xxhash-ffi # ghc 8.4 via xxhash build failure
- hslua # criterion 1.5.1
# Transitive outdated dependencies # Transitive outdated dependencies
# These packages # These packages