From c84466fb2925393839cfd756775ff8ff46f73ea4 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Tue, 28 Jan 2020 09:21:10 -0800 Subject: [PATCH] ;shake: can use the default stack.yaml/GHC 8.8 (#1090) [ci skip] --- Shake.hs | 5 +---- stack.yaml | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Shake.hs b/Shake.hs index f521be99f..f65ad9c28 100755 --- a/Shake.hs +++ b/Shake.hs @@ -1,7 +1,7 @@ #!/usr/bin/env stack {- stack exec --verbosity=info - --stack-yaml=stack-8.6.yaml + --stack-yaml=stack.yaml --package base-prelude --package directory --package extra @@ -11,9 +11,6 @@ --package time ghc -} --- Normally uses the project's default resolver & extra deps (stack.yaml). --- Currently using stack-8.6.yaml (& building two sets of deps) because of --- https://github.com/iconnect/regex/issues/173#issuecomment-570836346 {- One of two project scripts files (Makefile, Shake.hs). This one diff --git a/stack.yaml b/stack.yaml index e96c4ecaa..a5a0d1842 100644 --- a/stack.yaml +++ b/stack.yaml @@ -19,3 +19,5 @@ extra-deps: # for hledger-ui: # for hledger-web: - wai-handler-launch-3.0.3 +# for Shake.hs: +- regex-1.1.0.0