From e364dd4e8f40bb75f8a1cb00b57f4dba30913f89 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 6 Mar 2019 00:30:16 +0200 Subject: [PATCH 1/2] Upgrade to GHC 8.6.4 --- Dockerfile | 2 +- build-constraints.yaml | 2 +- check | 2 +- debian-bootstrap.sh | 2 +- etc/ci-script.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index a8d79183..408a8fc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ENV HOME /home/stackage ENV LANG en_US.UTF-8 # NOTE: also update debian-bootstrap.sh when cuda version changes -ENV PATH /usr/local/cuda-10.0/bin:/opt/ghc/8.6.3/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 ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh diff --git a/build-constraints.yaml b/build-constraints.yaml index 25c68006..fc261171 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1,6 +1,6 @@ ghc-major-version: "8.6" # new curator is supposed to use exact GHC version -ghc-version: "8.6.3" +ghc-version: "8.6.4" # This affects which version of the Cabal file format we allow. We # should ensure that this is always no greater than the version diff --git a/check b/check index aa76cea3..9ed2b812 100755 --- a/check +++ b/check @@ -3,4 +3,4 @@ # Convenience script for checking constraints locally cd `dirname $0` -exec stack exec --resolver ghc-8.6.3 stackage-curator check +exec stack exec --resolver ghc-8.6.4 stackage-curator check diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index 1525a5e1..6b90ed36 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -146,7 +146,7 @@ apt-get install -y \ zlib1g-dev \ zsh -GHCVER=8.6.3 +GHCVER=8.6.4 add-apt-repository ppa:hvr/ghc -y apt-get install -y ghc-$GHCVER ghc-$GHCVER-dyn ghc-$GHCVER-htmldocs ghc-$GHCVER-prof diff --git a/etc/ci-script.sh b/etc/ci-script.sh index 91c08bc3..c70f2b32 100755 --- a/etc/ci-script.sh +++ b/etc/ci-script.sh @@ -2,7 +2,7 @@ set -euxo pipefail -export GHCVER=8.6.3 +export GHCVER=8.6.4 # Download and unpack the stack executable mkdir -p ~/.local/bin From b0ac72676319eb425ea6fd4d19055a340623a03f Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 6 Mar 2019 00:52:55 +0200 Subject: [PATCH 2/2] Block three packages with transformers upper bounds and close #4408 --- build-constraints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b90d5b06..8b587a32 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2096,7 +2096,7 @@ packages: - range "Vladislav Zavialov @int-index": - - transformers-lift + - transformers-lift < 0 # transformers https://github.com/commercialhaskell/stackage/issues/4408 - union - named - inj @@ -2173,7 +2173,7 @@ packages: - xlsx "Matt Parsons @parsonsmatt": - - monad-logger-prefix + - monad-logger-prefix < 0 # trasnformers https://github.com/commercialhaskell/stackage/issues/4408 - monad-metrics < 0 # - ekg-cloudwatch # http-conduit 2.3 via amazonka - smtp-mail @@ -2745,7 +2745,7 @@ packages: - binary-bits "Alex McLean @yaxu": - - tidal + - tidal < 0 # transformers https://github.com/commercialhaskell/stackage/issues/4408 - hosc "Kei Hibino @khibino":