Merge remote-tracking branch 'upstream/master'

CURATORS.md

@@ -21,7 +21,7 @@ process works:
 * [stackage-curator](http://www.stackage.org/package/stackage-curator) combines build-constraints.yaml with the current state of Hackage to create a build plan for a Stackage Nightly
 * stackage-curator can check that build plan to ensure all version bounds are consistent
     * The [Travis job](https://github.com/commercialhaskell/stackage/blob/master/.travis.yml) performs these two steps to provide immediate feedback on pull requests
-* Docker Hub [builds](https://github.com/commercialhaskell/stackage/blob/master/Dockerfile) a [Docker image](https://registry.hub.docker.com/u/snoyberg/stackage/) for running builds
+* Docker Hub [builds](https://github.com/commercialhaskell/stackage/blob/master/Dockerfile) a [Docker image](https://hub.docker.com/r/commercialhaskell/stackage/) for running builds
 * The stackage-build server (described below) is able to run automated builds using the [build.sh script](https://github.com/commercialhaskell/stackage/blob/master/automated/build.sh)
 * When a new Nightly build is completed, it is uploaded to [the nightly repo](https://github.com/fpco/stackage-nightly)
 * Once a week, we run an LTS minor bump. Instead of using build-constraints.yaml, that job takes the previous LTS release, turns it into constraints, and then bumps the version numbers to the latest on Hackage, in accordance with the version bounds in the build plan. This plans are uploaded to [the LTS repo](https://github.com/fpco/lts-haskell)

Dockerfile

@@ -4,9 +4,9 @@ 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-8.0/bin:/opt/ghc/8.4.3/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ENV PATH /usr/local/cuda-10.0/bin:/opt/ghc/8.6.1/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV CUDA_PATH /usr/local/cuda-8.0
+ENV CUDA_PATH /usr/local/cuda-10.0
-ENV LD_LIBRARY_PATH=/usr/local/cuda-8.0/lib64:/usr/local/cuda-8.0/nvvm/lib64
+ENV LD_LIBRARY_PATH=/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/nvvm/lib64
 
 ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh
 RUN /tmp/debian-bootstrap.sh && rm /tmp/debian-bootstrap.sh

automated/run-nightly.sh

@@ -7,6 +7,7 @@ while true; do
     date
 
     ./new-stackage-format/convert.sh
+    date
 
     sleep 30m
     echo

check

@@ -3,4 +3,4 @@
 # Convenience script for checking constraints locally
 
 cd `dirname $0`
-exec stack exec --resolver ghc-8.4.3 stackage-curator check
+exec stack exec --resolver ghc-8.6.1 stackage-curator check

debian-bootstrap.sh

@@ -25,7 +25,7 @@ add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://down
 add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-apache24-compat main'
 add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main'
 
-GHCVER=8.4.3
+GHCVER=8.6.1
 
 apt-get update
 apt-get install -y \
@@ -103,6 +103,7 @@ apt-get install -y \
     libpcap0.8-dev \
     libpq-dev \
     libre2-dev \
+    librocksdb-dev \
     libsdl1.2-dev \
     libsdl2-dev \
     libsdl2-gfx-dev \
@@ -173,11 +174,11 @@ wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
     && apt-get update \
     && apt-get install -y llvm-5.0
 
-# llvm-6.0 for llvm-hs (separate since it needs wget)
+# llvm-7.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/xenial/ llvm-toolchain-xenial-6.0 main" \
+    && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main" \
     && apt-get update \
-    && apt-get install -y llvm-6.0
+    && apt-get install -y llvm-7
 
 # Buggy versions of ld.bfd fail to link some Haskell packages:
 # https://sourceware.org/bugzilla/show_bug.cgi?id=17689. Gold is
@@ -254,15 +255,26 @@ curl https://download.libsodium.org/libsodium/releases/LATEST.tar.gz > libsodium
 	&& ./configure \
 	&& make install
 
+# Install secp256k1
+cd /tmp \
+  && git clone https://github.com/bitcoin-core/secp256k1.git \
+  && cd secp256k1 \
+  && ./autogen.sh \
+  && ./configure --enable-module-recovery \
+  && make \
+  && make install
+
+
 # NOTE: also update Dockerfile when cuda version changes
 # Install CUDA toolkit
 # The current version can be found at: https://developer.nvidia.com/cuda-downloads
-CUDA_PKG=8.0.61-1         # update this on new version
+CUDA_PKG=10.0.130-1
-CUDA_VER=${CUDA_PKG:0:3}
+CUDA_VER=10.0
-CUDA_APT=${CUDA_VER/./-}
+CUDA_APT=10-0
 
 pushd /tmp \
     && wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/cuda-repo-ubuntu1604_${CUDA_PKG}_amd64.deb \
+    && apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/7fa2af80.pub \
     && dpkg -i cuda-repo-ubuntu1604_${CUDA_PKG}_amd64.deb \
     && apt-get update -qq \
     && apt-get install -y cuda-drivers cuda-core-${CUDA_APT} cuda-cudart-dev-${CUDA_APT} cuda-cufft-dev-${CUDA_APT} cuda-cublas-dev-${CUDA_APT} cuda-cusparse-dev-${CUDA_APT} cuda-cusolver-dev-${CUDA_APT} \

etc/ci-script.sh

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