Merge branch 'master' into patch-19

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-8.0/bin:/opt/ghc/8.4.1/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ENV PATH /usr/local/cuda-8.0/bin:/opt/ghc/8.4.2/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
 

MAINTAINERS.md

@@ -180,3 +180,43 @@ release (e.g., if `lts-8.9` is out, you would want your package to appear in
   but it may take some time.
 * We gradually stop maintainng old LTS major versions, so your
   request may take longer or be declined if it's for an old LTS.
+
+## LTS package guarantees and exceptions
+
+In general, we try to stick to some rules when it comes to the
+packages included in LTS minor bumps. In particular:
+
+* If a package exists in LTS-X.Y, it should also exist in LTS-X.(Y+1)
+* We should not include a major version bump of a package between
+  LTS-X.Y and LTS-X.(Y+1)
+
+However, there are some cases where exceptions may be made, based
+purely on Stackage Curator discretion. The most common examples are:
+
+*   If a package does not follow the PVP in its version number policy,
+    applying the standard version bump rules would not necessarily
+    makes sense. As an example, suppose package `foo` decides to
+    follow SemVer instead of the PVP. By our standard rules of version
+    bumps, a change from `foo-1.2.0` to `foo-1.3.0` would be
+    considered a major version bump, and disallowed in an LTS minor
+    version bump. However, if a package is following SemVer, this
+    would not be a breaking change, and curators may elect to include
+    it.
+
+*   If a package has overly restrictive version bounds on a
+    dependency, in particular constraining a minor version
+    unnecessarily, we may drop that package instead of artificially
+    holding back the dependency. As an example: suppose `LTS-20.1`
+    includes `foo-1.2.0` and `bar-1`. `bar-1` has a dependency `foo >=
+    1.2.0 && < 1.2.1`, which is overly constrained on the minor
+    version number according to the PVP. Then `foo-1.2.1` is
+    released. The Stackage Curator team would have two choices:
+
+    * Reject `foo-1.2.1` from `LTS-20.2`, since that is what `bar-1`
+      requires.
+    * Drop `bar-1` from `LTS-20.2`, and allow `foo-1.2.1`.
+
+    Decisions will need to be taken on a case-by-case basis, and may
+    depend on such issues as whether an important bugfix or security
+    update in included. The curator team may also try to notify the
+    author of `bar` to try and get a patched version released.

check

@@ -3,4 +3,4 @@
 # Convenience script for checking constraints locally
 
 cd `dirname $0`
-exec stack exec --resolver ghc-8.4.1 stackage-curator check
+exec stack exec --resolver ghc-8.4.2 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.1
+GHCVER=8.4.2
 
 apt-get update
 apt-get install -y \
@@ -33,7 +33,6 @@ apt-get install -y \
     build-essential \
     cmake \
     curl \
-    erlang-base \
     freeglut3-dev \
     freetds-dev \
     fsharp \
@@ -225,6 +224,15 @@ cd /tmp \
 echo "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/" > /etc/ld.so.conf.d/openjdk.conf \
     && ldconfig
 
+# Install erlang/otp platform and its dependencies
+ERLANG_VERSION="20.2.2"
+ERLANG_DEB_FILE="esl-erlang_${ERLANG_VERSION}-1~debian~jessie_amd64.deb"
+pushd /tmp \
+    && wget https://packages.erlang-solutions.com/erlang/esl-erlang/FLAVOUR_1_general/${ERLANG_DEB_FILE} \
+    && (dpkg -i ${ERLANG_DEB_FILE}; apt-get install -yf) \
+    && rm ${ERLANG_DEB_FILE} \
+    && popd
+
 # Install version 3 of the protobuf compiler.  (The `protobuf-compiler` package only
 # supports version 2.)
 curl -OL https://github.com/google/protobuf/releases/download/v3.3.0/protoc-3.3.0-linux-x86_64.zip \
@@ -237,6 +245,14 @@ curl https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-l
     && rm libtensorflow.tar.gz \
     && ldconfig
 
+# Install libsodium
+curl https://download.libsodium.org/libsodium/releases/LATEST.tar.gz > libsodium.tar.gz \
+	&& sudo tar xfz libsodium.tar.gz -C /tmp \
+	&& rm libsodium.tar.gz \
+	&& cd /tmp/libsodium-stable \
+	&& ./configure \
+	&& 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