summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-06-03 11:44:33 -0400
committerJoey Hess2016-06-03 11:44:33 -0400
commitd0d7d891abefaf747cb5203c1a3d91bb4481b6c0 (patch)
treef56ec6b5ae4df561574e5cdbb3fa4472a10601da
parent432cbefafb4145525639acb20984d7c1beb33c0d (diff)
better deal with stack resolver being in two places
-rw-r--r--src/Propellor/DotDir.hs5
-rw-r--r--stack.yaml1
2 files changed, 5 insertions, 1 deletions
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:
- '.'