@@ -22,9 +22,8 @@ add-apt-repository ppa:hvr/ghc -y
22add-apt-repository -y ppa:marutter/rrutter
22add-apt-repository -y ppa:marutter/rrutter
23# not sure what this was needed for
23# not sure what this was needed for
24#add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse
24#add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse
25−wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
25+#wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
26−echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" >> /etc/apt/sources.list
27−echo "deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" >> /etc/apt/sources.list
26+add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main"
29# Set the GHC version
28# Set the GHC version
30GHCVER=8.0.2
29GHCVER=8.0.2
@@ -114,8 +113,8 @@ apt-get install -y \
114 libzip-dev \
113 libzip-dev \
115 libzmq3-dev \
114 libzmq3-dev \
116 llvm-3.7 \
115 llvm-3.7 \
117 locales \
117 locales \
120 nettle-dev \
119 nettle-dev \