From 25d0709d559ecde2694bfc1309173f99d41680cb Mon Sep 17 00:00:00 2001
From: Dan Burton <danburton.email@gmail.com>
Date: Wed, 25 Sep 2019 16:35:30 -0700
Subject: [PATCH] Update everything to ghc 8.8.1

---
 Dockerfile          |  2 +-
 debian-bootstrap.sh | 12 ++++++------
 etc/ci-script.sh    |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1bd56971..fa3dc0c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM fpco/pid1:18.04
 
 ENV HOME /home/stackage
 ENV LANG en_US.UTF-8
-ENV GHCVER 8.6.5
+ENV GHCVER 8.8.1
 
 # NOTE: also update debian-bootstrap.sh when cuda version changes
 ENV PATH /home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER/bin:/usr/local/cuda-10.0/bin:/usr/sbin:/usr/bin:/sbin:/bin
diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index 0e2ce841..f2cc16dc 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -131,7 +131,7 @@ apt-get install -y \
     libzip-dev \
     libzstd-dev \
     libzmq3-dev \
-    llvm-6.0 \
+    llvm-7.0 \
     llvm-8 \
     locales \
     m4 \
@@ -183,9 +183,9 @@ update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.bfd" 10
 # This version is tracked here:
 # https://ghc.haskell.org/trac/ghc/wiki/Commentary/Compiler/Backends/LLVM/Installing
 #
-# GHC 8.6 requires LLVM 6.0 tools (specifically, llc-6.0 and opt-6.0).
-update-alternatives --install "/usr/bin/llc" "llc" "/usr/bin/llc-6.0" 50
-update-alternatives --install "/usr/bin/opt" "opt" "/usr/bin/opt-6.0" 50
+# GHC 8.8 requires LLVM 7.0 tools (?) (specifically, llc-7.0 and opt-7.0).
+update-alternatives --install "/usr/bin/llc" "llc" "/usr/bin/llc-7.0" 50
+update-alternatives --install "/usr/bin/opt" "opt" "/usr/bin/opt-7.0" 50
 
 # nodejs 10 (nodejs8 in bionic needs conflicting libssl10-dev)
 curl -sL https://deb.nodesource.com/setup_10.x | bash -
@@ -257,8 +257,8 @@ apt-add-repository multiverse \
     && apt-get update \
     && apt-get install -y nvidia-cuda-dev
 
-export CLANG_PURE_LLVM_LIB_DIR=/usr/lib/llvm-6.0/lib;
-export CLANG_PURE_LLVM_INCLUDE_DIR=/usr/lib/llvm-6.0/include;
+export CLANG_PURE_LLVM_LIB_DIR=/usr/lib/llvm-7.0/lib;
+export CLANG_PURE_LLVM_INCLUDE_DIR=/usr/lib/llvm-7.0/include;
 
 # protoc, for proto-lens-combinators test suite
 # Instructions from: https://google.github.io/proto-lens/installing-protoc.html
diff --git a/etc/ci-script.sh b/etc/ci-script.sh
index 66e04114..192b2a9b 100755
--- a/etc/ci-script.sh
+++ b/etc/ci-script.sh
@@ -2,7 +2,7 @@
 
 set -euxo pipefail
 
-export GHCVER=8.6.5
+export GHCVER=8.8.1
 
 # Download and unpack the stack executable
 mkdir -p ~/.local/bin