From daefa483acd2587e5653d31eae2fbacdc04cbe8a Mon Sep 17 00:00:00 2001 From: Moritz Kiefer Date: Sun, 8 Sep 2019 06:52:22 +0200 Subject: [PATCH 1/2] Install LLVM 9.0 in the docker image This is required for the latest version of llvm-hs. --- build-constraints.yaml | 4 ---- debian-bootstrap.sh | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index cf44ea46..61a5efe8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4836,10 +4836,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4811 - polysemy < 1.2.0.0 - # https://github.com/commercialhaskell/stackage/issues/4812 - - llvm-hs < 9 - - llvm-hs-pure < 9 - # end of packages # Package flags are applied to individual packages, and override the values of diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index b12ae29e..6c460a80 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -165,6 +165,11 @@ curl https://packages.microsoft.com/config/debian/9/prod.list > /etc/apt/sources apt-get update ACCEPT_EULA=Y apt-get install msodbcsql17 -y +# llvm for llvm-hs +curl https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - +apt-get update +apt-get install llvm-9 -y + locale-gen en_US.UTF-8 # Buggy versions of ld.bfd fail to link some Haskell packages: From 542678f212a0b1d816c9d401440f6ec47493ffa7 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Wed, 11 Sep 2019 06:45:27 -0700 Subject: [PATCH 2/2] Update build-constraints.yaml --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index cdb2500d..4312caeb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4822,9 +4822,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4809 - elm-street < 0.1 - # https://github.com/commercialhaskell/stackage/issues/4811 - - polysemy < 1.2.0.0 - # https://github.com/commercialhaskell/stackage/issues/4816 - trifecta < 2.1