diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-07-13 13:18:29 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-07-13 13:18:29 -0400 |
| commit | f33a1090b4347679602d6f75c281654ae46435b9 (patch) | |
| tree | ede8a75cc505f9221bfc8f3ea6637c78aaa60fb0 | |
| parent | 422def0f715dbdcf0f5ced89d20683c8c833761b (diff) | |
| parent | 102ee2aeacf4c3561da52c2552d759dd0ded4cc4 (diff) | |
Merge branch 'joeyconfig'
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | joeyconfig.hs | 2 | ||||
| -rw-r--r-- | src/Propellor/Bootstrap.hs | 7 | ||||
| -rw-r--r-- | src/Propellor/DotDir.hs | 2 | ||||
| -rw-r--r-- | src/Propellor/Property/Bootstrap.hs | 1 | ||||
| -rw-r--r-- | stack.yaml | 2 |
6 files changed, 9 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 4f151c78..160ff753 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ propellor (4.3.3) UNRELEASED; urgency=medium Thanks, Félix Sipma. * Export a Restic.backup' property. Thanks, Félix Sipma. + * Updated stack config to lts-8.22. -- Joey Hess <id@joeyh.name> Mon, 10 Jul 2017 11:57:49 -0400 diff --git a/joeyconfig.hs b/joeyconfig.hs index 2b7806b0..b039c558 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -4,6 +4,7 @@ module Main where import Propellor import Propellor.Property.Scheduled +import Propellor.Property.Bootstrap import qualified Propellor.Property.File as File import qualified Propellor.Property.Apt as Apt import qualified Propellor.Property.Network as Network @@ -79,6 +80,7 @@ testvm = host "testvm.kitenet.net" $ props darkstar :: Host darkstar = host "darkstar.kitenet.net" $ props + & bootstrapWith (Robustly Stack) & osDebian Unstable X86_64 & ipv6 "2001:4830:1600:187::2" & Aiccu.hasConfig "T18376" "JHZ2-SIXXS" 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, @@ -1,4 +1,4 @@ # When updating the resolver here, also update stackResolver in Propellor.DotDir -resolver: lts-7.16 +resolver: lts-8.22 packages: - '.' |