haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-01-26 06:01:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update everything to ghc 8.8.1

Browse Source
This commit is contained in:
Dan Burton 2019-09-25 16:35:30 -07:00
parent 62242e11fc
commit 25d0709d55
No known key found for this signature in database
GPG Key ID: 41F154F410EC12E0
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -2,7 +2,7 @@ FROM fpco/pid1:18.04
ENV HOME /home/stackage ENV HOME /home/stackage
ENV LANG en_US.UTF-8 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 # 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 /home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER/bin:/usr/local/cuda-10.0/bin:/usr/sbin:/usr/bin:/sbin:/bin

12
debian-bootstrap.sh
View File

@ -131,7 +131,7 @@ apt-get install -y \
libzip-dev \ libzip-dev \
libzstd-dev \ libzstd-dev \
libzmq3-dev \ libzmq3-dev \
llvm-6.0 \ llvm-7.0 \
llvm-8 \ llvm-8 \
locales \ locales \
m4 \ m4 \
@ -183,9 +183,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.6 requires LLVM 6.0 tools (specifically, llc-6.0 and opt-6.0). # 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-6.0" 50 update-alternatives --install "/usr/bin/llc" "llc" "/usr/bin/llc-7.0" 50
update-alternatives --install "/usr/bin/opt" "opt" "/usr/bin/opt-6.0" 50 update-alternatives --install "/usr/bin/opt" "opt" "/usr/bin/opt-7.0" 50
# nodejs 10 (nodejs8 in bionic needs conflicting libssl10-dev) # nodejs 10 (nodejs8 in bionic needs conflicting libssl10-dev)
curl -sL https://deb.nodesource.com/setup_10.x | bash - curl -sL https://deb.nodesource.com/setup_10.x | bash -
@ -257,8 +257,8 @@ apt-add-repository multiverse \
&& apt-get update \ && apt-get update \
&& apt-get install -y nvidia-cuda-dev && apt-get install -y nvidia-cuda-dev
export CLANG_PURE_LLVM_LIB_DIR=/usr/lib/llvm-6.0/lib; export CLANG_PURE_LLVM_LIB_DIR=/usr/lib/llvm-7.0/lib;
export CLANG_PURE_LLVM_INCLUDE_DIR=/usr/lib/llvm-6.0/include; export CLANG_PURE_LLVM_INCLUDE_DIR=/usr/lib/llvm-7.0/include;
# protoc, for proto-lens-combinators test suite # protoc, for proto-lens-combinators test suite
# Instructions from: https://google.github.io/proto-lens/installing-protoc.html # Instructions from: https://google.github.io/proto-lens/installing-protoc.html

2
etc/ci-script.sh
View File

@ -2,7 +2,7 @@
set -euxo pipefail set -euxo pipefail
export GHCVER=8.6.5 export GHCVER=8.8.1
# Download and unpack the stack executable # Download and unpack the stack executable
mkdir -p ~/.local/bin mkdir -p ~/.local/bin