2bdf481 · stackage · git.iko.soy

git.iko.soy/stackage

on master help sign in

Merge commit 'b7d45e8' into nightly

2bdf481Jens Petersen9 years ago

build-constraints.yaml+1

@@ -4006,3 +4006,4 @@ hide:

4006# Always use the cabal file shipped with the sdist tarball instead.

4007no-revisions:

4008- tls

4009+- mime-mail

debian-bootstrap.sh+6−5

@@ -178,11 +178,12 @@ cd /tmp \

178echo "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/" > /etc/ld.so.conf.d/openjdk.conf \

179 && ldconfig

180

181+# currently the repo seems broken

181−# llvm-4.0 for llvm-hs (separate since it needs wget)

182+# # llvm-4.0 for llvm-hs (separate since it needs wget)

182−wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \

183+# wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \

183− && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" \

184+# && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" \

184− && apt-get update \

185+# && apt-get update \

185− && apt-get install -y llvm-4.0

186+# && apt-get install -y llvm-4.0

186

187

187## non-free repo for mediabus-fdk-aac

188## non-free repo for mediabus-fdk-aac

188#apt-add-repository multiverse \

189#apt-add-repository multiverse \