Merge pull request #1565 from RyanGlScott/master

Add back machines
This commit is contained in:
Dan Burton 2016-06-08 07:50:35 -07:00
commit a2b0e9a2fa

View File

@ -277,7 +277,7 @@ packages:
- linear - linear
# GHC 8 - linear-accelerate # GHC 8 - linear-accelerate
# GHC 8 - log-domain # GHC 8 - log-domain
# BLOCKED distributive 0.5 - machines - machines
- monadic-arrays - monadic-arrays
- monad-products - monad-products
- monad-products - monad-products
@ -2396,7 +2396,6 @@ skipped-tests:
- bound - bound
- heaps - heaps
- hyphenation - hyphenation
# BLOCKED distributive 0.5 - machines
# https://github.com/kaizhang/clustering/issues/2 # https://github.com/kaizhang/clustering/issues/2
- clustering - clustering
@ -2921,7 +2920,6 @@ expected-haddock-failures:
# build benchmarks. The difference here will be whether dependencies for these # build benchmarks. The difference here will be whether dependencies for these
# benchmarks are included or not. # benchmarks are included or not.
skipped-benchmarks: skipped-benchmarks:
- machines
- criterion-plus - criterion-plus
- graphviz - graphviz
- lifted-base - lifted-base