From 78655fad0f7d39d2aed47e8260d72867247ff5a6 Mon Sep 17 00:00:00 2001 From: Moritz Kiefer Date: Tue, 16 Jul 2019 19:53:04 +0200 Subject: [PATCH] Add llvm-hs back to stackage --- build-constraints.yaml | 2 +- debian-bootstrap.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ee63fc13..87d2c4ae 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3053,7 +3053,7 @@ packages: "Moritz Kiefer @cocreature": - lrucaching - - llvm-hs < 0 # https://github.com/commercialhaskell/stackage/issues/4238 + - llvm-hs - llvm-hs-pure "Thierry Bourrillon @tbourrillon": diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index dd06d03d..1b5a6433 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -165,11 +165,11 @@ ACCEPT_EULA=Y apt-get install msodbcsql17 -y locale-gen en_US.UTF-8 -# llvm-7.0 for llvm-hs (separate since it needs wget) +# llvm-8.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/bionic/ llvm-toolchain-bionic-7 main" \ && apt-get update \ - && apt-get install -y llvm-7 + && apt-get install -y llvm-8 # Buggy versions of ld.bfd fail to link some Haskell packages: # https://sourceware.org/bugzilla/show_bug.cgi?id=17689. Gold is