diff --git a/.travis.yml b/.travis.yml index b697bd6b..47bbda04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ addons: - libgmp-dev env: -- GHCVER=7.10.3 +- GHCVER=8.0.1 install: # Download and unpack the stack executable diff --git a/Dockerfile b/Dockerfile index 59041d90..c6886c39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:16.04 ENV HOME /home/stackage ENV LANG en_US.UTF-8 -ENV PATH /opt/ghc/7.10.3/bin:/usr/sbin:/usr/bin:/sbin:/bin +ENV PATH /opt/ghc/8.0.1/bin:/usr/sbin:/usr/bin:/sbin:/bin ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh RUN /tmp/debian-bootstrap.sh && rm /tmp/debian-bootstrap.sh diff --git a/build-constraints.yaml b/build-constraints.yaml index f0f9557d..e88c91ca 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1,4 +1,4 @@ -ghc-major-version: "7.10" +ghc-major-version: "8.0" # Constraints for brand new builds packages: "alpheccar @alpheccar": @@ -2285,7 +2285,7 @@ packages: - hw-prim < 0.0.0.11 # Need to always match the version shipped with GHC - - Win32 == 2.3.1.0 + - Win32 == 2.3.1.1 # https://github.com/fpco/stackage/issues/1446 - megaparsec < 5.0.0 diff --git a/check b/check index d72aa5b3..c25c3c4a 100755 --- a/check +++ b/check @@ -2,4 +2,5 @@ # Convenience script for checking constraints locally -exec stack exec --resolver ghc-7.10.3 stackage-curator check +cd `dirname $0` +exec stack exec --resolver ghc-8.0.1 stackage-curator check diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index f297de94..36768586 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -31,8 +31,8 @@ echo 'deb http://download.fpcomplete.com/ubuntu xenial main'|tee /etc/apt/source apt-get update apt-get install -y \ build-essential \ - ghc-7.10.3 \ - ghc-7.10.3-htmldocs \ + ghc-8.0.1 \ + ghc-8.0.1-htmldocs \ hscolour \ sudo \ curl \