diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-09-17 13:04:40 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-09-19 15:49:19 -0400 |
| commit | 9c1b8ad931e7bfabe521bc17e74ac9869b21a748 (patch) | |
| tree | 1b55774a86146fd95ffc9776356200c82c71c3ed | |
| parent | e195dae6d959e2a9b1a22a2ca78db5955e1d7dea (diff) | |
| download | haskell-9c1b8ad931e7bfabe521bc17e74ac9869b21a748.tar.gz | |
Bump Stack resolver
| -rw-r--r-- | hadrian/hadrian.cabal | 2 | ||||
| -rw-r--r-- | hadrian/src/Base.hs | 6 | ||||
| -rw-r--r-- | hadrian/stack.yaml | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/hadrian/hadrian.cabal b/hadrian/hadrian.cabal index 290af0cd8b..611cd20796 100644 --- a/hadrian/hadrian.cabal +++ b/hadrian/hadrian.cabal @@ -144,7 +144,7 @@ executable hadrian , filepath , mtl == 2.2.* , parsec >= 3.1 && < 3.2 - , shake >= 0.18.3 && < 0.18.6 + , shake >= 0.18.3 && < 0.20 , transformers >= 0.4 && < 0.6 , unordered-containers >= 0.2.1 && < 0.3 build-tools: alex >= 3.1 diff --git a/hadrian/src/Base.hs b/hadrian/src/Base.hs index f7f1029d4e..9e096f412b 100644 --- a/hadrian/src/Base.hs +++ b/hadrian/src/Base.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE CPP #-} + module Base ( -- * General utilities module Control.Applicative, @@ -34,7 +36,11 @@ import Control.Monad.Reader import Data.List.Extra import Data.Maybe import Data.Semigroup +#if MIN_VERSION_shake(0,19,0) +import Development.Shake hiding (unit, Normal) +#else import Development.Shake hiding (unit, (*>), Normal) +#endif import Development.Shake.Classes import Development.Shake.FilePath import Development.Shake.Util diff --git a/hadrian/stack.yaml b/hadrian/stack.yaml index ee73741502..c9324108ba 100644 --- a/hadrian/stack.yaml +++ b/hadrian/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-15.5 +resolver: lts-16.14 packages: - '.' |