git.iko.soy/stackage
on master help sign in
Update Docker image to use ghc 8.4, llvm 5.0
commit63aa8a67dcce817abd601e389144802c84ad02a6 authorDan Burton <danburton.email@gmail.com> dateMon 12 Mar 2018, 15:24 (9 years ago) parent9ee4de3
2 files changed+11−11
compare with master
unifiedsplit
Dockerfile+1−1 debian-bootstrap.sh+10−10
Dockerfile+1−1
@@ -4,7 +4,7 @@ ENV HOME /home/stackage
44ENV LANG en_US.UTF-8
55
66# NOTE: also update debian-bootstrap.sh when cuda version changes
7−ENV PATH /usr/local/cuda-8.0/bin:/opt/ghc/8.2.2/bin:/usr/sbin:/usr/bin:/sbin:/bin
7+ENV PATH /usr/local/cuda-8.0/bin:/opt/ghc/8.4.1/bin:/usr/sbin:/usr/bin:/sbin:/bin
88ENV CUDA_PATH /usr/local/cuda-8.0
99ENV LD_LIBRARY_PATH=/usr/local/cuda-8.0/lib64:/usr/local/cuda-8.0/nvvm/lib64
1010
debian-bootstrap.sh+10−10
@@ -25,7 +25,7 @@ add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://down
2525add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-apache24-compat main'
2626add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main'
2727
28−GHCVER=8.2.2
28+GHCVER=8.4.1
2929
3030apt-get update
3131apt-get install -y \
@@ -156,6 +156,12 @@ curl -sSL https://get.haskellstack.org/ | sh
156156# Put documentation where we expect it
157157mv /opt/ghc/$GHCVER/share/doc/ghc-$GHCVER/ /opt/ghc/$GHCVER/share/doc/ghc
158158
159+# llvm-5.0 for llvm-hs (separate since it needs wget)
160+wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
161+ && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main" \
162+ && apt-get update \
163+ && apt-get install -y llvm-5.0
164+
159165# Buggy versions of ld.bfd fail to link some Haskell packages:
160166# https://sourceware.org/bugzilla/show_bug.cgi?id=17689. Gold is
161167# faster anyways and uses less RAM.
@@ -166,9 +172,9 @@ update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.bfd" 10
166172# This version is tracked here:
167173# https://ghc.haskell.org/trac/ghc/wiki/Commentary/Compiler/Backends/LLVM/Installing
168174#
169−# GHC 8.2 requires LLVM 3.9 tools (specifically, llc-3.9 and opt-3.9).
170−update-alternatives --install "/usr/bin/llc" "llc" "/usr/bin/llc-3.9" 50
171−update-alternatives --install "/usr/bin/opt" "opt" "/usr/bin/opt-3.9" 50
175+# GHC 8.4 requires LLVM 5.0 tools (specifically, llc-5.0 and opt-5.0).
176+update-alternatives --install "/usr/bin/llc" "llc" "/usr/bin/llc-5.0" 50
177+update-alternatives --install "/usr/bin/opt" "opt" "/usr/bin/opt-5.0" 50
172178
173179# Made sure a "node" binary is in the path, as well as "nodejs".
174180# A historical naming collision on Debian means that the binary is called "nodejs",
@@ -202,12 +208,6 @@ cd /tmp \
202208echo "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/" > /etc/ld.so.conf.d/openjdk.conf \
203209 && ldconfig
204210
205−# llvm-4.0 for llvm-hs (separate since it needs wget)
206−wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
207− && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main" \
208− && apt-get update \
209− && apt-get install -y llvm-5.0
210−
211211# Install version 3 of the protobuf compiler. (The `protobuf-compiler` package only
212212# supports version 2.)
213213curl -OL https://github.com/google/protobuf/releases/download/v3.3.0/protoc-3.3.0-linux-x86_64.zip \