Commit 907cad60 authored by Zhen Zhang's avatar Zhen Zhang Committed by Andrey Mokhov

Update shake and add stm to stage1 packages (#419)

* Update shake

* Add stm to Stage 1 packages
parent fcdecad4
...@@ -124,7 +124,7 @@ executable hadrian ...@@ -124,7 +124,7 @@ executable hadrian
, extra >= 1.4.7 , extra >= 1.4.7
, mtl == 2.2.* , mtl == 2.2.*
, QuickCheck >= 2.6 && < 2.10 , QuickCheck >= 2.6 && < 2.10
, shake >= 0.15.6 , shake == 0.16.*
, transformers >= 0.4 && < 0.6 , transformers >= 0.4 && < 0.6
, unordered-containers == 0.2.* , unordered-containers == 0.2.*
build-tools: alex >= 3.1 build-tools: alex >= 3.1
......
...@@ -191,6 +191,7 @@ stage1Packages = do ...@@ -191,6 +191,7 @@ stage1Packages = do
, process , process
, rts , rts
, runGhc , runGhc
, stm
, time ] , time ]
++ [ iservBin | not win ] ++ [ iservBin | not win ]
++ [ unix | not win ] ++ [ unix | not win ]
......
...@@ -25,9 +25,6 @@ module Hadrian.Utilities ( ...@@ -25,9 +25,6 @@ module Hadrian.Utilities (
putProgressInfo, renderAction, renderProgram, renderLibrary, renderBox, putProgressInfo, renderAction, renderProgram, renderLibrary, renderBox,
renderUnicorn, renderUnicorn,
-- * Shake compatibility
RuleResult,
-- * Miscellaneous -- * Miscellaneous
(<&>), (%%>), cmdLineLengthLimit, (<&>), (%%>), cmdLineLengthLimit,
...@@ -183,9 +180,6 @@ buildRoot = do ...@@ -183,9 +180,6 @@ buildRoot = do
infixl 1 <&> 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. -- | 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 -- The current implementation simply assumes that a file is generated if it
-- lives in the 'buildRoot' directory. Since most files are not generated the -- lives in the 'buildRoot' directory. Since most files are not generated the
......
...@@ -8,6 +8,9 @@ packages: ...@@ -8,6 +8,9 @@ packages:
- '.' - '.'
- '../libraries/Cabal/Cabal' - '../libraries/Cabal/Cabal'
extra-deps:
- shake-0.16
nix: nix:
packages: packages:
- autoconf - autoconf
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment