[Git][ghc/ghc][master] Bump Stack resolver

[Marge Bot]

 Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
9c1b8ad9 by Sylvain Henry at 2020-09-19T15:49:19-04:00
Bump Stack resolver

- - - - -


3 changed files:

- hadrian/hadrian.cabal
- hadrian/src/Base.hs
- hadrian/stack.yaml


Changes:

=====================================
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


=====================================
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


=====================================
hadrian/stack.yaml
=====================================
@@ -1,4 +1,4 @@
-resolver: lts-15.5
+resolver: lts-16.14
 
 packages:
 - '.'



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9c1b8ad931e7bfabe521bc17e74ac9869b21a748

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9c1b8ad931e7bfabe521bc17e74ac9869b21a748
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200919/09d59dbc/attachment-0001.html>