From ca9b62cd56c0678b21eef8ca0499cbc97b82d653 Mon Sep 17 00:00:00 2001
From: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
Date: Wed, 14 Mar 2018 09:26:10 +0100
Subject: [PATCH] Install LLVM 6.0 in docker image and reenable llvm-hs

---
 build-constraints.yaml | 1 -
 debian-bootstrap.sh    | 8 +++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index cd20824b..304f16b4 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3755,7 +3755,6 @@ packages:
         - pipes-fluid < 0 # GHC 8.4 via lifted-async
         - quickcheck-state-machine < 0 # GHC 8.4 via lifted-async
         - shelly < 0 # GHC 8.4 via lifted-async
-        - llvm-hs < 0 # GHC 8.4 via llvm-hs-pure
         - lzma-conduit < 0 # GHC 8.4 via lzma
         - zim-parser < 0 # GHC 8.4 via lzma
         - heist < 0 # GHC 8.4 via map-syntax
diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index cb111408..c407a32a 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -156,12 +156,18 @@ curl -sSL https://get.haskellstack.org/ | sh
 # Put documentation where we expect it
 mv /opt/ghc/$GHCVER/share/doc/ghc-$GHCVER/ /opt/ghc/$GHCVER/share/doc/ghc
 
-# llvm-5.0 for llvm-hs (separate since it needs wget)
+# llvm-5.0 for GHC (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-5.0 main" \
     && apt-get update \
     && apt-get install -y llvm-5.0
 
+# llvm-6.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-6.0 main" \
+    && apt-get update \
+    && apt-get install -y llvm-6.0
+
 # Buggy versions of ld.bfd fail to link some Haskell packages:
 # https://sourceware.org/bugzilla/show_bug.cgi?id=17689. Gold is
 # faster anyways and uses less RAM.