Merge branch 'master' into nightly

This commit is contained in:
Jens Petersen 2017-05-01 17:29:08 +09:00
commit a08ffeeba4
2 changed files with 15 additions and 10 deletions

View File

@ -1,11 +1,13 @@
ghc-major-version: "8.0" ghc-major-version: "8.0"
# Constraints for brand new builds # Constraints for brand new builds
packages: packages:
"Timo Koepke <timo.koepke@gmail.com> @koepket":
- hinterface
"Jose Iborra <pepeiborra@gmail.com> @pepeiborra": "Jose Iborra <pepeiborra@gmail.com> @pepeiborra":
[] - clr-marshal
# - clr-marshal - clr-host
# - clr-host - clr-inline
# - clr-inline
"Joshua Koike <jkoike2013@gmail.com> @jano017": "Joshua Koike <jkoike2013@gmail.com> @jano017":
- discord-hs - discord-hs
@ -1085,6 +1087,7 @@ packages:
"Jens Petersen <juhpetersen@gmail.com> @juhp": "Jens Petersen <juhpetersen@gmail.com> @juhp":
- cabal-rpm - cabal-rpm
- stackage-query
# - cabal-sort # BLOCKED directory 1.3 # - cabal-sort # BLOCKED directory 1.3
- idris # bounds: safe - idris # bounds: safe
- libffi - libffi
@ -2870,8 +2873,7 @@ packages:
- printcess - printcess
"Alexey Kuleshevich <lehins@yandex.ru> @lehins": "Alexey Kuleshevich <lehins@yandex.ru> @lehins":
[] - wai-middleware-auth
# - wai-middleware-auth # https://github.com/fpco/wai-middleware-auth/issues/3
# - hip # via repa: bounds: vector # - hip # via repa: bounds: vector
"Hans-Peter Deifel <hpd@hpdeifel.de> @hpdeifel": "Hans-Peter Deifel <hpd@hpdeifel.de> @hpdeifel":
@ -3018,10 +3020,12 @@ packages:
- uri-bytestring-aeson - uri-bytestring-aeson
"Sebastian Witte <woozletoff@gmail.com> @saep": "Sebastian Witte <woozletoff@gmail.com> @saep":
[] - nvim-hs
# - nvim-hs # build failure https://github.com/fpco/stackage/pull/2457 - nvim-hs-contrib
# - nvim-hs-contrib # per nvim-hs - nvim-hs-ghcid
# - nvim-hs-ghcid # per nvim-hs
"Sam Protas <sam.protas@gmail.com> @SamProtas":
- triplesec
# If you stop maintaining a package you can move it here. # If you stop maintaining a package you can move it here.
# It will then be disabled if it starts causing problems. # It will then be disabled if it starts causing problems.

View File

@ -75,6 +75,7 @@ apt-get install -y \
libmagickcore-dev \ libmagickcore-dev \
libmagickwand-dev \ libmagickwand-dev \
libmarkdown2-dev \ libmarkdown2-dev \
libmono-2.0-dev \
libmp3lame-dev \ libmp3lame-dev \
libmpfr-dev \ libmpfr-dev \
libmysqlclient-dev \ libmysqlclient-dev \