git.iko.soy/stackage
on master help sign in
Merge pull request #3371 from cocreature/llvm-hs-6.0

Install LLVM 6.0 in docker image and reenable llvm-hs

commita06ca1544f56636ac020c756974ed2c6c9247330 authorDan Burton <danburton.email@gmail.com> dateWed 14 Mar 2018, 07:11 (9 years ago) parent80f2db8ca9b62c
2 files changed+7−2
compare with master
unifiedsplit
build-constraints.yaml−1 debian-bootstrap.sh+7−1
build-constraints.yaml−1
@@ -3755,7 +3755,6 @@ packages:
37553755 - pipes-fluid < 0 # GHC 8.4 via lifted-async
37563756 - quickcheck-state-machine < 0 # GHC 8.4 via lifted-async
37573757 - shelly < 0 # GHC 8.4 via lifted-async
3758− - llvm-hs < 0 # GHC 8.4 via llvm-hs-pure
37593758 - lzma-conduit < 0 # GHC 8.4 via lzma
37603759 - zim-parser < 0 # GHC 8.4 via lzma
37613760 - heist < 0 # GHC 8.4 via map-syntax
debian-bootstrap.sh+7−1
@@ -156,12 +156,18 @@ 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)
159+# llvm-5.0 for GHC (separate since it needs wget)
160160wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
161161 && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main" \
162162 && apt-get update \
163163 && apt-get install -y llvm-5.0
164164
165+# llvm-6.0 for llvm-hs (separate since it needs wget)
166+wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
167+ && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main" \
168+ && apt-get update \
169+ && apt-get install -y llvm-6.0
170+
165171# Buggy versions of ld.bfd fail to link some Haskell packages:
166172# https://sourceware.org/bugzilla/show_bug.cgi?id=17689. Gold is
167173# faster anyways and uses less RAM.