mirror of
https://github.com/commercialhaskell/stackage.git
synced 2026-01-20 19:21:57 +01:00
Update Docker image to use ghc 8.4, llvm 5.0
This commit is contained in:
parent
9ee4de3d84
commit
63aa8a67dc
@ -4,7 +4,7 @@ ENV HOME /home/stackage
|
|||||||
ENV LANG en_US.UTF-8
|
ENV LANG en_US.UTF-8
|
||||||
|
|
||||||
# NOTE: also update debian-bootstrap.sh when cuda version changes
|
# NOTE: also update debian-bootstrap.sh when cuda version changes
|
||||||
ENV PATH /usr/local/cuda-8.0/bin:/opt/ghc/8.2.2/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
ENV PATH /usr/local/cuda-8.0/bin:/opt/ghc/8.4.1/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
||||||
ENV CUDA_PATH /usr/local/cuda-8.0
|
ENV CUDA_PATH /usr/local/cuda-8.0
|
||||||
ENV LD_LIBRARY_PATH=/usr/local/cuda-8.0/lib64:/usr/local/cuda-8.0/nvvm/lib64
|
ENV LD_LIBRARY_PATH=/usr/local/cuda-8.0/lib64:/usr/local/cuda-8.0/nvvm/lib64
|
||||||
|
|
||||||
|
|||||||
@ -25,7 +25,7 @@ add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://down
|
|||||||
add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-apache24-compat main'
|
add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-apache24-compat main'
|
||||||
add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main'
|
add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main'
|
||||||
|
|
||||||
GHCVER=8.2.2
|
GHCVER=8.4.1
|
||||||
|
|
||||||
apt-get update
|
apt-get update
|
||||||
apt-get install -y \
|
apt-get install -y \
|
||||||
@ -156,6 +156,12 @@ curl -sSL https://get.haskellstack.org/ | sh
|
|||||||
# Put documentation where we expect it
|
# Put documentation where we expect it
|
||||||
mv /opt/ghc/$GHCVER/share/doc/ghc-$GHCVER/ /opt/ghc/$GHCVER/share/doc/ghc
|
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)
|
||||||
|
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
|
||||||
|
|
||||||
# Buggy versions of ld.bfd fail to link some Haskell packages:
|
# Buggy versions of ld.bfd fail to link some Haskell packages:
|
||||||
# https://sourceware.org/bugzilla/show_bug.cgi?id=17689. Gold is
|
# https://sourceware.org/bugzilla/show_bug.cgi?id=17689. Gold is
|
||||||
# faster anyways and uses less RAM.
|
# faster anyways and uses less RAM.
|
||||||
@ -166,9 +172,9 @@ update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.bfd" 10
|
|||||||
# This version is tracked here:
|
# This version is tracked here:
|
||||||
# https://ghc.haskell.org/trac/ghc/wiki/Commentary/Compiler/Backends/LLVM/Installing
|
# https://ghc.haskell.org/trac/ghc/wiki/Commentary/Compiler/Backends/LLVM/Installing
|
||||||
#
|
#
|
||||||
# GHC 8.2 requires LLVM 3.9 tools (specifically, llc-3.9 and opt-3.9).
|
# GHC 8.4 requires LLVM 5.0 tools (specifically, llc-5.0 and opt-5.0).
|
||||||
update-alternatives --install "/usr/bin/llc" "llc" "/usr/bin/llc-3.9" 50
|
update-alternatives --install "/usr/bin/llc" "llc" "/usr/bin/llc-5.0" 50
|
||||||
update-alternatives --install "/usr/bin/opt" "opt" "/usr/bin/opt-3.9" 50
|
update-alternatives --install "/usr/bin/opt" "opt" "/usr/bin/opt-5.0" 50
|
||||||
|
|
||||||
# Made sure a "node" binary is in the path, as well as "nodejs".
|
# Made sure a "node" binary is in the path, as well as "nodejs".
|
||||||
# A historical naming collision on Debian means that the binary is called "nodejs",
|
# A historical naming collision on Debian means that the binary is called "nodejs",
|
||||||
@ -202,12 +208,6 @@ cd /tmp \
|
|||||||
echo "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/" > /etc/ld.so.conf.d/openjdk.conf \
|
echo "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/" > /etc/ld.so.conf.d/openjdk.conf \
|
||||||
&& ldconfig
|
&& ldconfig
|
||||||
|
|
||||||
# llvm-4.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-5.0 main" \
|
|
||||||
&& apt-get update \
|
|
||||||
&& apt-get install -y llvm-5.0
|
|
||||||
|
|
||||||
# Install version 3 of the protobuf compiler. (The `protobuf-compiler` package only
|
# Install version 3 of the protobuf compiler. (The `protobuf-compiler` package only
|
||||||
# supports version 2.)
|
# supports version 2.)
|
||||||
curl -OL https://github.com/google/protobuf/releases/download/v3.3.0/protoc-3.3.0-linux-x86_64.zip \
|
curl -OL https://github.com/google/protobuf/releases/download/v3.3.0/protoc-3.3.0-linux-x86_64.zip \
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user