summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSylvain Henry <sylvain@haskus.fr>2020-03-31 19:19:22 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-04-02 01:50:00 -0400
commit4980200255dabf59ae537f10c55d19ef1a00bbdd (patch)
tree98a152afb71c88d375e17588ed1df37a463bc0a7
parent27740f24cb70fc14b00c1212c06642a144a6117d (diff)
downloadhaskell-4980200255dabf59ae537f10c55d19ef1a00bbdd.tar.gz
Update Stack resolver for hadrian/build-stack
Broken by 57b888c0e90be7189285a6b078c30b26d0923809
-rw-r--r--hadrian/hadrian.cabal2
-rw-r--r--hadrian/stack.yaml6
2 files changed, 2 insertions, 6 deletions
diff --git a/hadrian/hadrian.cabal b/hadrian/hadrian.cabal
index 8e3a9289d4..1dc70d8728 100644
--- a/hadrian/hadrian.cabal
+++ b/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
diff --git a/hadrian/stack.yaml b/hadrian/stack.yaml
index f0edd52c82..ee73741502 100644
--- a/hadrian/stack.yaml
+++ b/hadrian/stack.yaml
@@ -1,8 +1,4 @@
-resolver: lts-14.7
-
-extra-deps:
-- happy-1.19.12
-- Cabal-3.0.0.0@sha256:1ba37b8d80e89213b17db7b8b9ea0108da55ca65f8c0cbb7433881a284c5cf67
+resolver: lts-15.5
packages:
- '.'