Merge branch 'master' into nightly

Dockerfile

@@ -2,7 +2,11 @@ FROM fpco/pid1:16.04
 
 ENV HOME /home/stackage
 ENV LANG en_US.UTF-8
-ENV PATH /opt/ghc/8.2.1/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+# NOTE: also update debian-bootstrap.sh when cuda version changes
+ENV PATH /usr/local/cuda-8.0/bin:/opt/ghc/8.2.1/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ENV CUDA_PATH /usr/local/cuda-8.0
+ENV LD_LIBRARY_PATH=/usr/local/cuda-8.0/lib64:/usr/local/cuda-8.0/nvvm/lib64
 
 ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh
 RUN /tmp/debian-bootstrap.sh && rm /tmp/debian-bootstrap.sh

build-constraints.yaml

@@ -670,12 +670,11 @@ packages:
         - gloss-algorithms
         - gloss-raster
         - gloss-rendering
-        # https://github.com/fpco/stackage/issues/2813
-        # - cuda
-        # - cublas
-        # - cusparse
-        # - cusolver
-        # - nvvm
+        - cuda
+        - cublas
+        - cusparse
+        - cusolver
+        - nvvm
 
     "Liam O'Connor <liamoc@cse.unsw.edu.au> @liamoc":
         []
@@ -1762,6 +1761,7 @@ packages:
         - hamilton
         - prompt
         - tagged-binary
+        - type-combinators-singletons
         - typelits-witnesses
         - uncertain
         - vector-sized

debian-bootstrap.sh

@@ -207,6 +207,7 @@ curl https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-l
     && rm libtensorflow.tar.gz \
     && ldconfig
 
+# 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