summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Bootstrap.hs7
-rw-r--r--src/Propellor/DotDir.hs2
-rw-r--r--src/Propellor/Property/Bootstrap.hs1
3 files changed, 5 insertions, 5 deletions
diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs
index baf36e49..21f051c9 100644
--- a/src/Propellor/Bootstrap.hs
+++ b/src/Propellor/Bootstrap.hs
@@ -83,16 +83,15 @@ buildCommand bs = intercalate " && " (go (getBuilder bs))
]
go Stack =
[ "stack build :propellor-config"
- , "ln -sf $(stack path --dist-dir)/build/propellor-config propellor"
+ , "ln -sf $(stack path --dist-dir)/build/propellor-config/propellor-config propellor"
]
--- Run cabal configure to check if all dependencies are installed;
--- if not, run the depsCommand.
+-- Check if all dependencies are installed; if not, run the depsCommand.
checkDepsCommand :: Bootstrapper -> Maybe System -> ShellCommand
checkDepsCommand bs sys = go (getBuilder bs)
where
go Cabal = "if ! cabal configure >/dev/null 2>&1; then " ++ depsCommand bs sys ++ "; fi"
- go Stack = "if ! stack --version >/dev/null 2>&1; then " ++ depsCommand bs sys ++ "; fi"
+ go Stack = "if ! stack build --dry-run >/dev/null 2>&1; then " ++ depsCommand bs sys ++ "; fi"
-- Install build dependencies of propellor, using the specified
-- Bootstrapper.
diff --git a/src/Propellor/DotDir.hs b/src/Propellor/DotDir.hs
index ffde705c..f42c0575 100644
--- a/src/Propellor/DotDir.hs
+++ b/src/Propellor/DotDir.hs
@@ -316,7 +316,7 @@ minimalConfig = do
]
stackResolver :: String
-stackResolver = "lts-7.16"
+stackResolver = "lts-8.22"
fullClone :: IO Result
fullClone = do
diff --git a/src/Propellor/Property/Bootstrap.hs b/src/Propellor/Property/Bootstrap.hs
index 93529c14..91d1a82f 100644
--- a/src/Propellor/Property/Bootstrap.hs
+++ b/src/Propellor/Property/Bootstrap.hs
@@ -3,6 +3,7 @@
module Propellor.Property.Bootstrap (
Bootstrapper(..),
+ Builder(..),
bootstrapWith,
RepoSource(..),
bootstrappedFrom,