Merge commit 'b7d45e8' into nightly

This commit is contained in:
Jens Petersen 2017-05-01 12:27:06 +09:00
commit 2bdf4819ee
2 changed files with 7 additions and 5 deletions

View File

@ -4006,3 +4006,4 @@ hide:
# Always use the cabal file shipped with the sdist tarball instead.
no-revisions:
- tls
- mime-mail

View File

@ -178,11 +178,12 @@ cd /tmp \
echo "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/" > /etc/ld.so.conf.d/openjdk.conf \
&& ldconfig
# llvm-4.0 for llvm-hs (separate since it needs wget)
wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
&& add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" \
&& apt-get update \
&& apt-get install -y llvm-4.0
# currently the repo seems broken
# # llvm-4.0 for llvm-hs (separate since it needs wget)
# wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
# && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" \
# && apt-get update \
# && apt-get install -y llvm-4.0
## non-free repo for mediabus-fdk-aac
#apt-add-repository multiverse \