From 2190c7bebf97058b185216865310a890eb0d81ef Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Wed, 29 Mar 2017 17:43:21 +0900
Subject: [PATCH] try to use add-apt-repository for the upstream llvm repo

---
 debian-bootstrap.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index 497009e0..d9b8b8c5 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -22,9 +22,8 @@ add-apt-repository ppa:hvr/ghc -y
 add-apt-repository -y ppa:marutter/rrutter
 # not sure what this was needed for
 #add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse
-wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
-echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" >> /etc/apt/sources.list
-echo "deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" >> /etc/apt/sources.list
+#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"
 
 # Set the GHC version
 GHCVER=8.0.2
@@ -114,8 +113,8 @@ apt-get install -y \
     libzip-dev \
     libzmq3-dev \
     llvm-3.7 \
+    llvm-4.0 \
     locales \
-    llvm-4.0-dev \
     m4 \
     nettle-dev \
     nodejs \