Revert "Install GHC via Stack"

This reverts commit 034c6e928f.
This commit is contained in:
Michael Snoyman 2019-03-06 13:52:52 +00:00
parent c321990cf5
commit cea8e2c191
2 changed files with 7 additions and 16 deletions

View File

@ -2,10 +2,9 @@ FROM fpco/pid1:16.04
ENV HOME /home/stackage
ENV LANG en_US.UTF-8
ENV GHCVER 8.6.4
# 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
ENV PATH /usr/local/cuda-10.0/bin:/opt/ghc/8.6.4/bin:/usr/sbin:/usr/bin:/sbin:/bin
ENV CUDA_PATH /usr/local/cuda-10.0
ENV LD_LIBRARY_PATH=/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/nvvm/lib64

View File

@ -10,20 +10,11 @@
# instructions, see:
# http://www.stackage.org/install
set -exuo pipefail
set -exu
mkdir /home/stackage -p
export DEBIAN_FRONTEND=noninteractive
# Get curl
apt-get update
apt-get install -y curl
# Get Stack and GHC
curl -sSL https://get.haskellstack.org/ | sh -s - -d /usr/bin
stack setup --resolver ghc-$GHCVER
apt-get update
apt-get install -y software-properties-common
@ -173,6 +164,11 @@ ACCEPT_EULA=Y apt-get install msodbcsql17 -y
locale-gen en_US.UTF-8
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 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" \
@ -308,7 +304,3 @@ export CLANG_PURE_LLVM_INCLUDE_DIR=/usr/lib/llvm-3.9/include;
# finally run:
ldconfig
# EOF: don't build anything below this line
# Cleanup
apt-get clean
rm -rf /var/lib/apt/lists/*