[commit: ghc] wip/circleci-ben: Merge commit '81b8b24c15c0f983920b0152f0a076b7a8006bb1' (18638d9)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/circleci-ben
Link       : http://ghc.haskell.org/trac/ghc/changeset/18638d9c745286cc2e3578769513a157b8ded830/ghc

>---------------------------------------------------------------

commit 18638d9c745286cc2e3578769513a157b8ded830
Merge: 5f158bc 81b8b24
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Nov 11 14:46:53 2017 -0500

    Merge commit '81b8b24c15c0f983920b0152f0a076b7a8006bb1'



>---------------------------------------------------------------

18638d9c745286cc2e3578769513a157b8ded830
 hadrian/.travis.yml                       |  4 +++-
 hadrian/appveyor.yml                      | 24 +++++++++++++-----------
 hadrian/cabal.project                     |  8 ++++++--
 hadrian/circle.yml                        |  3 ++-
 hadrian/hadrian.cabal                     |  2 +-
 hadrian/src/Settings/Packages/GhcCabal.hs | 11 +++++++++--
 hadrian/stack.yaml                        |  4 ++++
 7 files changed, 38 insertions(+), 18 deletions(-)