Merge branch 'master' into ghc7.10

Conflicts:
	automated/build.sh
	build-constraints.yaml

README.md

@@ -22,6 +22,7 @@ project information. In addition, we have the following repositories:
 * [stackage-update](https://github.com/fpco/stackage-update) [![Build Status](https://travis-ci.org/fpco/stackage-update.svg?branch=master)](https://travis-ci.org/fpco/stackage-update)
 * [stackage-upload](https://github.com/fpco/stackage-upload) [![Build Status](https://travis-ci.org/fpco/stackage-upload.svg?branch=master)](https://travis-ci.org/fpco/stackage-upload)
 * [stackage-install](https://github.com/fpco/stackage-install) [![Build Status](https://travis-ci.org/fpco/stackage-install.svg?branch=master)](https://travis-ci.org/fpco/stackage-install)
+* [stackage-build-plan](https://github.com/fpco/stackage-build-plan) [![Build Status](https://travis-ci.org/fpco/stackage-build-plan.svg?branch=master)](https://travis-ci.org/fpco/stackage-build-plan)
 
 Get your package included
 -------------------------

automated/build.sh

@@ -69,6 +69,6 @@ ARGS_BUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal:ro -v $GHC_DIR:/hom
 ARGS_UPLOAD="$ARGS_COMMON -v $AUTH_TOKEN:/auth-token:ro -v $HACKAGE_CREDS:/hackage-creds:ro -v $CURATOR_DIR:/home/stackage/.stackage-curator -v $SSH_DIR:/home/ubuntu/.ssh:ro -v $GITCONFIG:/home/stackage/.gitconfig:ro"
 
 # Use cabal update first to initialize ~/.cabal.config, then use stackage-curator update to get it securely
-docker run $ARGS_PREBUILD $IMAgE /bin/bash -c "cabal update && stackage-curator update && stackage-curator create-plan --plan-file $PLAN_FILE --target $TARGET && stackage-curator check --plan-file $PLAN_FILE && stackage-curator fetch --plan-file $PLAN_FILE && cabal install random cabal-install"
+docker run $ARGS_PREBUILD $IMAGE /bin/bash -c "cabal update && stackage-curator update && stackage-curator create-plan --plan-file $PLAN_FILE --target $TARGET ${CONSTRAINTS:-} && stackage-curator check --plan-file $PLAN_FILE && stackage-curator fetch --plan-file $PLAN_FILE && cabal install random cabal-install"
 docker run $ARGS_BUILD $IMAGE stackage-curator make-bundle --plan-file $PLAN_FILE --bundle-file $BUNDLE_FILE --target $TARGET
 docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "stackage-curator upload --bundle-file $BUNDLE_FILE && stackage-curator hackage-distro --plan-file $PLAN_FILE --target $TARGET && stackage-curator upload-github --plan-file $PLAN_FILE --target $TARGET"

build-constraints.yaml

@@ -105,6 +105,7 @@ packages:
         - stackage-upload
         - stackage-cli
         - stackage-install
+        - stackage-build-plan
         - statistics-linreg
         - th-expand-syns
         - thyme
@@ -708,7 +709,7 @@ packages:
     "Marcin Mrotek <marcin.jan.mrotek@gmail.com>":
         - type-list
 
-    "David Turner <dave.c.turner@gmail.com>":
+    "David Turner <dave.c.turner@gmail.com> @davecturner":
         - alarmclock
         - bank-holidays-england
 
@@ -1292,6 +1293,9 @@ expected-test-failures:
     # https://github.com/ekmett/linear/issues/75 GHC 7.10
     - linear
 
+    # https://github.com/yesodweb/Shelly.hs/issues/99
+    - shelly
+
 # Haddocks which are expected to fail. Same concept as expected test failures.
 expected-haddock-failures:
     # https://github.com/acw/bytestring-progress/issues/4

stackage/stackage.cabal

@@ -1,5 +1,5 @@
 name:                stackage
-version:             0.7.1.0
+version:             0.7.2.0
 synopsis:            Dummy package forcing installation of other Stackage packages
 homepage:            https://www.stackage.org/
 license:             MIT
@@ -18,6 +18,7 @@ library
                      , stackage-update
                      , stackage-upload
                      , stackage-install
+                     , stackage-build-plan
   default-language:    Haskell2010
 
 source-repository head