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

Merge pull request #4407 from commercialhaskell/ghc864

Browse Source 
Upgrade to GHC 8.6.4
This commit is contained in:
Michael Snoyman 2019-03-06 00:53:27 +02:00 committed by GitHub
commit 248f676f9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 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

@ -4,7 +4,7 @@ ENV HOME /home/stackage
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8
# NOTE: also update debian-bootstrap.sh when cuda version changes # 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 ENV CUDA_PATH /usr/local/cuda-10.0
ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh

8
build-constraints.yaml
View File

@ -1,6 +1,6 @@
ghc-major-version: "8.6" ghc-major-version: "8.6"
# new curator is supposed to use exact GHC version # 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 # This affects which version of the Cabal file format we allow. We
# should ensure that this is always no greater than the version # should ensure that this is always no greater than the version
@ -2096,7 +2096,7 @@ packages:
- range - range
"Vladislav Zavialov <vlad.z.4096@gmail.com> @int-index": "Vladislav Zavialov <vlad.z.4096@gmail.com> @int-index":
- transformers-lift - transformers-lift < 0 # transformers https://github.com/commercialhaskell/stackage/issues/4408
- union - union
- named - named
- inj - inj
@ -2173,7 +2173,7 @@ packages:
- xlsx - xlsx
"Matt Parsons <parsonsmatt@gmail.com> @parsonsmatt": "Matt Parsons <parsonsmatt@gmail.com> @parsonsmatt":
- monad-logger-prefix - monad-logger-prefix < 0 # trasnformers https://github.com/commercialhaskell/stackage/issues/4408
- monad-metrics < 0 - monad-metrics < 0
# - ekg-cloudwatch # http-conduit 2.3 via amazonka # - ekg-cloudwatch # http-conduit 2.3 via amazonka
- smtp-mail - smtp-mail
@ -2745,7 +2745,7 @@ packages:
- binary-bits - binary-bits
"Alex McLean <alex@slab.org> @yaxu": "Alex McLean <alex@slab.org> @yaxu":
- tidal - tidal < 0 # transformers https://github.com/commercialhaskell/stackage/issues/4408
- hosc - hosc
"Kei Hibino <ex8k.hibino@gmail.com> @khibino": "Kei Hibino <ex8k.hibino@gmail.com> @khibino":

2
check
View File

@ -3,4 +3,4 @@
# Convenience script for checking constraints locally # Convenience script for checking constraints locally
cd `dirname $0` 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

2
debian-bootstrap.sh
View File

@ -146,7 +146,7 @@ apt-get install -y \
zlib1g-dev \ zlib1g-dev \
zsh zsh
GHCVER=8.6.3 GHCVER=8.6.4
add-apt-repository ppa:hvr/ghc -y add-apt-repository ppa:hvr/ghc -y
apt-get install -y ghc-$GHCVER ghc-$GHCVER-dyn ghc-$GHCVER-htmldocs ghc-$GHCVER-prof apt-get install -y ghc-$GHCVER ghc-$GHCVER-dyn ghc-$GHCVER-htmldocs ghc-$GHCVER-prof

2
etc/ci-script.sh
View File

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