diff --git a/Shake.hs b/Shake.hs index 9f7e361cf..18edec950 100755 --- a/Shake.hs +++ b/Shake.hs @@ -9,7 +9,8 @@ --package shake --package time ghc --} -- uses the project's current stack resolver +-} +-- uses the project's default resolver & extra deps (see stack.yaml) {- One of two project scripts files (Makefile, Shake.hs). This one diff --git a/stack.yaml b/stack.yaml index c8e9ac591..5a5ce47a9 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,7 +1,6 @@ # stack build plan using GHC 8.6.5 -resolver: lts-14.4 -#resolver: nightly-2019-07-26 +resolver: lts-14.16 packages: - hledger-lib @@ -16,13 +15,15 @@ nix: # allow-newer: true extra-deps: -# for testing base-compat 0.11 compatibility: -- aeson-1.4.6.0 -- aeson-compat-0.3.9 -- attoparsec-iso8601-1.0.1.0 -- base-compat-batteries-0.11.0 -- base-compat-0.11.0 -- http-api-data-0.4.1.1 +# for Shake.hs (regex doesn't support base-compat-0.11): +- regex-1.0.2.0@rev:1 +# for testing base-compat 0.11 compatibility (mutually exclusive with the above): +# - aeson-1.4.6.0 +# - aeson-compat-0.3.9 +# - attoparsec-iso8601-1.0.1.0 +# - base-compat-batteries-0.11.0 +# - base-compat-0.11.0 +# - http-api-data-0.4.1.1 # for hledger-lib: # for hledger: # for hledger-ui: