[commit: ghc] master: Squashed 'hadrian/' changes from fa3771fe6b..4499b294e4 (360d740)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/360d7404809b3fa54541f7f932a6864294f75a4a/ghc

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

commit 360d7404809b3fa54541f7f932a6864294f75a4a
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Nov 22 08:47:55 2017 -0500

    Squashed 'hadrian/' changes from fa3771fe6b..4499b294e4
    
    4499b294e4 Follow GHC changes
    8fd68186b2 Add ways to build hadrian using nix
    e5c7a29c23 Do not depend on the in-tree filepath library
    9dd7ad2acc Fix dependencies
    497184390e Bring mtl dependency back
    6c5f5c9bd9 Minor clean up of Hadrian dependencies
    9aff81d424 Fix Windows build
    fa95caa8df Unbreak `cabal new-build`
    
    git-subtree-dir: hadrian
    git-subtree-split: 4499b294e4a53f71f8808d6eb55a7dd0b341cfb8


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

360d7404809b3fa54541f7f932a6864294f75a4a
 README.md                          |  4 +--
 build.stack.nix.sh => build.nix.sh | 18 ++++++-----
 cabal.project                      |  3 +-
 hadrian.cabal                      | 10 +++----
 shell.nix                          | 61 ++++++++++++++++++++++++++++++++++++++
 src/Rules/Compile.hs               |  2 --
 src/Rules/Dependencies.hs          |  4 +--
 src/Rules/Program.hs               |  3 --
 src/Settings/Builders/Ghc.hs       |  8 ++---
 src/Settings/Packages/GhcCabal.hs  |  5 ++--
 src/Utilities.hs                   | 30 ++++++++++++-------
 stack.yaml                         |  7 ++---
 12 files changed, 110 insertions(+), 45 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 360d7404809b3fa54541f7f932a6864294f75a4a