Merge branch 'master' into nightly

This commit is contained in:
Mihai Maruseac 2017-05-23 21:35:49 -04:00
commit dfb47c169b
2 changed files with 20 additions and 7 deletions

View File

@ -13,7 +13,7 @@ packages:
- clr-marshal
- clr-host
- threepenny-editors
# - clr-inline # see https://github.com/fpco/stackage/issues/2510
- clr-inline # possibly nondeterministic failures, see https://github.com/fpco/stackage/issues/2510
"Joshua Koike <jkoike2013@gmail.com> @jano017":
- discord-hs
@ -2569,6 +2569,10 @@ packages:
- zot
- yjtools
- io-machine
- yjsvg
- x11-xim
- Imlib
- xturtle
"Jan Gerlinger <git@jangerlinger.de> @JanGe":
- irc-dcc
@ -3026,10 +3030,10 @@ packages:
- proto-lens-combinators
- proto-lens-arbitrary
- proto-lens-optparse
# - tensorflow # https://github.com/fpco/stackage/issues/2527
# - tensorflow-core-ops # https://github.com/fpco/stackage/issues/2527
- tensorflow # https://github.com/fpco/stackage/issues/2527
- tensorflow-core-ops # https://github.com/fpco/stackage/issues/2527
- tensorflow-opgen
# - tensorflow-ops # https://github.com/fpco/stackage/issues/2527
- tensorflow-ops # https://github.com/fpco/stackage/issues/2527
- tensorflow-proto
- tensorflow-test
@ -3103,6 +3107,7 @@ packages:
- imm < 1.1.0.1
- opml-conduit < 0.6.0.2
- rss-conduit < 0.3.0.1
- MusicBrainz < 0.3
# https://github.com/fpco/stackage/issues/2317
- skylighting < 0.2
@ -3167,9 +3172,6 @@ packages:
# https://github.com/fpco/stackage/issues/2504
- statistics < 0.14
# https://github.com/fpco/stackage/issues/2505
- one-liner < 0.9
# https://github.com/fpco/stackage/issues/2513
- hsyslog < 5
@ -3182,6 +3184,15 @@ packages:
# https://github.com/fpco/stackage/issues/2528
- concurrent-output < 1.10.0
# https://github.com/fpco/stackage/issues/2529
- mmorph < 1.1.0
# https://github.com/fpco/stackage/issues/2530
- cue-sheet < 0.1.1
# https://github.com/fpco/stackage/issues/2533
- mysql-haskell < 0.8.1.0
# end of packages
# Package flags are applied to individual packages, and override the values of
@ -3551,6 +3562,7 @@ expected-test-failures:
- unicode-show # https://github.com/nushio3/unicode-show/issues/2
- xmonad # 0.12 https://github.com/xmonad/xmonad/issues/36
- pixelated-avatar-generator # 0.1.3 https://github.com/ExcaliburZero/pixelated-avatar-generator/issues/19
- xml-picklers # https://github.com/Philonous/xml-picklers/issues/5
# Compilation failures
- ListLike # No issue tracker, e-mail sent to maintainer

View File

@ -71,6 +71,7 @@ apt-get install -y \
libgtksourceview-3.0-dev \
libhidapi-dev \
libicu-dev \
libimlib2-dev \
libjudy-dev \
liblapack-dev \
libleveldb-dev \