Merge branch 'master' into nightly

CURATORS.md

@@ -382,6 +382,9 @@ will upgrade their packages to allow for the new GHC release.
 We prefer to prune packages causing upper bounds constraints **after** the LTS
 release to allow the maximum amount of packages to get into the newest LTS.
 
+You will almost always need to update the Win32 package version listed in the
+build-constraints.yaml file.
+
 After the first LTS release, the package pruning process may begin in the
 nightly build in order to move forward with getting the latest versions of
 packages compatible with the new GHC release.

MAINTAINERS.md

@@ -16,7 +16,7 @@ To add your package, first fork this repository.
 In the [`build-constraints.yaml`](https://github.com/fpco/stackage/blob/master/build-constraints.yaml) file, there's a section called `packages`.
 To add a set of packages, you would add:
 
-    "My Name myemail@example.com @mygithubuser":
+    "My Name <myemail@example.com> @mygithubuser":
         - package1
         - package2
         - package3

check

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

debian-bootstrap.sh

@@ -30,17 +30,16 @@ GHCVER=8.2.1
 apt-get update
 apt-get install -y \
     build-essential \
-    ghc-$GHCVER \
-    ghc-$GHCVER-dyn \
-    ghc-$GHCVER-prof \
-    ghc-$GHCVER-htmldocs \
-    hscolour \
-    sudo \
     curl \
     freeglut3-dev \
     fsharp \
+    ghc-$GHCVER \
+    ghc-$GHCVER-dyn \
+    ghc-$GHCVER-htmldocs \
+    ghc-$GHCVER-prof \
     git \
     gradle \
+    hscolour \
     libadns1-dev \
     libaio1 \
     libalut-dev \
@@ -50,6 +49,7 @@ apt-get install -y \
     libcairo2-dev \
     libclang-3.9-dev \
     libcurl4-openssl-dev \
+    libcwiid-dev \
     libdevil-dev \
     libedit-dev \
     libedit2 \
@@ -94,10 +94,11 @@ apt-get install -y \
     libpango1.0-dev \
     libpcap0.8-dev \
     libpq-dev \
+    libsdl1.2-dev \
     libsdl2-dev \
-    libsdl2-mixer-dev \
-    libsdl2-image-dev \
     libsdl2-gfx-dev \
+    libsdl2-image-dev \
+    libsdl2-mixer-dev \
     libsdl2-ttf-dev \
     libsnappy-dev \
     libsndfile1-dev \
@@ -133,6 +134,7 @@ apt-get install -y \
     r-base \
     r-base-dev \
     ruby-dev \
+    sudo \
     wget \
     xclip \
     z3 \