[commit: ghc] wip/nfs-locking: Update shake and add stm to stage1 packages (#419) (907cad6)

[git at git.haskell.org]

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

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/907cad60863a4ea2b940fa7aa6c73b0da82eab7c/ghc

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

commit 907cad60863a4ea2b940fa7aa6c73b0da82eab7c
Author: Zhen Zhang <izgzhen at gmail.com>
Date:   Fri Sep 22 17:53:09 2017 +0800

    Update shake and add stm to stage1 packages (#419)
    
    * Update shake
    
    * Add stm to Stage 1 packages


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

907cad60863a4ea2b940fa7aa6c73b0da82eab7c
 hadrian.cabal            | 2 +-
 src/GHC.hs               | 1 +
 src/Hadrian/Utilities.hs | 6 ------
 stack.yaml               | 3 +++
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/hadrian.cabal b/hadrian.cabal
index b01d866..97b283a 100644
--- a/hadrian.cabal
+++ b/hadrian.cabal
@@ -124,7 +124,7 @@ executable hadrian
                        , extra                >= 1.4.7
                        , mtl                  == 2.2.*
                        , QuickCheck           >= 2.6 && < 2.10
-                       , shake                >= 0.15.6
+                       , shake                == 0.16.*
                        , transformers         >= 0.4 && < 0.6
                        , unordered-containers == 0.2.*
     build-tools:         alex  >= 3.1
diff --git a/src/GHC.hs b/src/GHC.hs
index ab6f93b..32676cd 100644
--- a/src/GHC.hs
+++ b/src/GHC.hs
@@ -191,6 +191,7 @@ stage1Packages = do
              , process
              , rts
              , runGhc
+             , stm
              , time               ]
           ++ [ iservBin | not win ]
           ++ [ unix     | not win ]
diff --git a/src/Hadrian/Utilities.hs b/src/Hadrian/Utilities.hs
index 8f6f4cc..06ee663 100644
--- a/src/Hadrian/Utilities.hs
+++ b/src/Hadrian/Utilities.hs
@@ -25,9 +25,6 @@ module Hadrian.Utilities (
     putProgressInfo, renderAction, renderProgram, renderLibrary, renderBox,
     renderUnicorn,
 
-    -- * Shake compatibility
-    RuleResult,
-
     -- * Miscellaneous
     (<&>), (%%>), cmdLineLengthLimit,
 
@@ -183,9 +180,6 @@ buildRoot = do
 
 infixl 1 <&>
 
--- | Introduced in shake-0.16, so use to make the rest of the code compatible
-type family RuleResult a
-
 -- | Given a 'FilePath' to a source file, return 'True' if it is generated.
 -- The current implementation simply assumes that a file is generated if it
 -- lives in the 'buildRoot' directory. Since most files are not generated the
diff --git a/stack.yaml b/stack.yaml
index a05f2cd..2a92f26 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -8,6 +8,9 @@ packages:
 - '.'
 - '../libraries/Cabal/Cabal'
 
+extra-deps:
+- shake-0.16
+
 nix:
    packages:
    - autoconf