Merge branch 'master' into nightly

This commit is contained in:
Jens Petersen 2017-03-30 10:59:48 +09:00
commit 48ad3a87d4

View File

@ -354,7 +354,7 @@ packages:
- MFlow - MFlow
- transient - transient
- transient-universe - transient-universe
- ghcjs-hplay # - ghcjs-hplay # https://github.com/transient-haskell/axiom/issues/16
"Edward Kmett <ekmett@gmail.com> @ekmett": "Edward Kmett <ekmett@gmail.com> @ekmett":
- ad - ad
@ -1107,6 +1107,7 @@ packages:
- binary-tagged - binary-tagged
- cabal-doctest - cabal-doctest
- edit-distance - edit-distance
- functor-classes-compat
- generics-sop-lens - generics-sop-lens
- github - github
- insert-ordered-containers - insert-ordered-containers
@ -1721,7 +1722,7 @@ packages:
- type-spec - type-spec
- pretty-types - pretty-types
- mediabus - mediabus
- mediabus-fdk-aac #- mediabus-fdk-aac # needs non-free libfdk-aac-dev
- mediabus-rtp - mediabus-rtp
# "Will Thompson <will@willthompson.co.uk> @wjt": # "Will Thompson <will@willthompson.co.uk> @wjt":
@ -3051,6 +3052,10 @@ package-flags:
ghc_7_7: false ghc_7_7: false
ghc_8_0: true ghc_8_0: true
functor-classes-compat:
containers: false
unordered-containers: false # https://github.com/fpco/stackage/issues/2386
# end of package-flags # end of package-flags
# Special configure options for individual packages # Special configure options for individual packages