@@ -10,20 +10,11 @@
1010# instructions, see:
1111# http://www.stackage.org/install
1212
13−set -exuo pipefail
13+set -exu
1414
1515mkdir /home/stackage -p
1616
1717export DEBIAN_FRONTEND=noninteractive
18−
19−# Get curl
20−apt-get update
21−apt-get install -y curl
22−
23−# Get Stack and GHC
24−curl -sSL https://get.haskellstack.org/ | sh -s - -d /usr/bin
25−stack setup --resolver ghc-$GHCVER
26−
2718apt-get update
2819apt-get install -y software-properties-common
2920
@@ -173,6 +164,11 @@ ACCEPT_EULA=Y apt-get install msodbcsql17 -y
173164
174165locale-gen en_US.UTF-8
175166
167+curl -sSL https://get.haskellstack.org/ | sh
168+
169+# Put documentation where we expect it
170+mv /opt/ghc/$GHCVER/share/doc/ghc-$GHCVER/ /opt/ghc/$GHCVER/share/doc/ghc
171+
176172# llvm-5.0 for GHC (separate since it needs wget)
177173wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
178174 && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main" \
@@ -308,7 +304,3 @@ export CLANG_PURE_LLVM_INCLUDE_DIR=/usr/lib/llvm-3.9/include;
308304# finally run:
309305ldconfig
310306# EOF: don't build anything below this line
311−
312−# Cleanup
313−apt-get clean
314−rm -rf /var/lib/apt/lists/*