From d0d7d891abefaf747cb5203c1a3d91bb4481b6c0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 3 Jun 2016 11:44:33 -0400 Subject: better deal with stack resolver being in two places --- src/Propellor/DotDir.hs | 5 ++++- stack.yaml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Propellor/DotDir.hs b/src/Propellor/DotDir.hs index f32b52a4..79b0b43f 100644 --- a/src/Propellor/DotDir.hs +++ b/src/Propellor/DotDir.hs @@ -308,13 +308,16 @@ minimalConfig = do stackcontent = -- This should be the same resolver version in propellor's -- own stack.yaml - [ "resolver: lts-5.10" + [ "resolver: " ++ stackResolver , "packages:" , "- '.'" , "extra-deps:" , "- propellor-" ++ showVersion Package.version ] +stackResolver :: String +stackResolver = "lts-5.10" + fullClone :: IO Result fullClone = do d <- dotPropellor diff --git a/stack.yaml b/stack.yaml index 7b6bcef8..2689c624 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,3 +1,4 @@ +# When updating the resolver here, also update stackResolver in Propellor.DotDir resolver: lts-5.10 packages: - '.' -- cgit v1.2.3