Update from parent

.travis.yml

@@ -2,7 +2,7 @@
 sudo: false
 
 # Choose a lightweight base image; we provide our own build tools.
-language: c
+language: generic
 
 # GHC depends on GMP. You can add other dependencies here as well.
 addons:

CURATORS.md

@@ -207,7 +207,7 @@ You'll need to get your SSH public key added to the machine. ~/.ssh/config info:
 ```
 Host stackage-build
     User curators
-    Hostname ec2-52-5-20-252.compute-1.amazonaws.com
+    Hostname build.stackage.org
 ```
 
 ### Running the build script
@@ -279,15 +279,15 @@ Replace nightly with `lts7` to wipe the LTS 7 cache.
 
 ## Local curator setup
 
-We don't run the full stackage build locally as that might take too
+We do not run the full stackage build locally as that might take too
 much time. Some steps on the other hand are much faster to do
 yourself.
 
-It's useful to be able to modify constraints locally before pushing to
+It is useful to be able to modify constraints locally before pushing to
 the repository. To do this first install stackage-curator:
 `git clone git@github.com:fpco/stackage-curator.git && cd stackage-curator && stack install`
 or get the linux binary: https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2
-(it's a good idea to upgrade stackage-curator at least at the start of your week as curator).
+(it is a good idea to upgrade stackage-curator at least at the start of your week as curator).
 Then clone the stackage repo `git clone git@github.com:fpco/stackage.git`.
 Inside it run `stack update && stackage-curator check` to get new packages and do dependency resolution.
 
@@ -295,5 +295,10 @@ This can be used to make sure all version bounds are in place
 (including for test suites and benchmarks), to check whether bounds
 can be lifted, and to get `tell-me-when-its-released` notifications.
 
-Notably this doesn't build anything, so you won't see any compilation
+Notably this does not build anything, so you wont see any compilation
 errors for builds/tests/benchmarks.
+
+## Adding new curators
+
+1. Add public ssh key to `~/.ssh/authorized_keys` on build server
+2. Add to fpco/stackage project.

automated/build.sh

@@ -77,7 +77,7 @@ rm -f stackage-curator stackage-curator.bz2
 wget https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2
 bunzip2 stackage-curator.bz2
 chmod +x stackage-curator
-stackage-curator --version
+./stackage-curator --version
 )
 
 ARGS_COMMON="--rm -v $WORKDIR:$HOME/work -w $HOME/work -v $BINDIR/stackage-curator:/usr/bin/stackage-curator:ro -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro -v $EXTRA_BIN_DIR/stack:/usr/bin/stack:ro"

build-constraints.yaml

@@ -2709,6 +2709,16 @@ packages:
         # https://github.com/fpco/stackage/issues/2136
         - X11 < 1.7
 
+        # https://github.com/fpco/stackage/issues/2177
+        - aeson < 1.1.0.0
+
+        # https://github.com/fpco/stackage/issues/2178
+        - hledger < 1.1
+        - hledger-lib < 1.1
+        - hledger-api < 1.1
+        - hledger-ui < 1.1
+        - hledger-web < 1.1
+
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of
@@ -3040,7 +3050,6 @@ expected-test-failures:
     - dbus # 0.10.12 No issue tracker, e-mail sent to maintainer
     - hspec-expectations-pretty-diff # GHC 8 issue not reported upstream since issue tracker disabled
     - jose-jwt # doctest ambiguity https://github.com/fpco/stackage/issues/2169
-    - safecopy # time 1.6 https://github.com/acid-state/safecopy/issues/45
     - servant-server # 0.9.1.1 due to hspec-wai-0.8.0 https://github.com/haskell-servant/servant/issues/643
     - sourcemap # https://github.com/chrisdone/sourcemap/issues/3
     - text-ldap # # https://github.com/khibino/haskell-text-ldap/issues/1