[Git][ghc/ghc][master] Update Stack resolver for hadrian/build-stack

[Marge Bot]

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


Commits:
49802002 by Sylvain Henry at 2020-04-02T01:50:00-04:00
Update Stack resolver for hadrian/build-stack

Broken by 57b888c0e90be7189285a6b078c30b26d0923809

- - - - -


2 changed files:

- hadrian/hadrian.cabal
- hadrian/stack.yaml


Changes:

=====================================
hadrian/hadrian.cabal
=====================================
@@ -141,7 +141,7 @@ executable hadrian
                        , mtl                  == 2.2.*
                        , parsec               >= 3.1     && < 3.2
                        , QuickCheck           >= 2.6     && < 2.14
-                       , shake                >= 0.18.3  && < 0.18.4
+                       , shake                >= 0.18.3  && < 0.18.6
                        , transformers         >= 0.4     && < 0.6
                        , unordered-containers >= 0.2.1   && < 0.3
     build-tools:         alex  >= 3.1


=====================================
hadrian/stack.yaml
=====================================
@@ -1,8 +1,4 @@
-resolver: lts-14.7
-
-extra-deps:
-- happy-1.19.12
-- Cabal-3.0.0.0 at sha256:1ba37b8d80e89213b17db7b8b9ea0108da55ca65f8c0cbb7433881a284c5cf67
+resolver: lts-15.5
 
 packages:
 - '.'



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4980200255dabf59ae537f10c55d19ef1a00bbdd

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4980200255dabf59ae537f10c55d19ef1a00bbdd
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/20200402/d322ac02/attachment.html>