diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-06-07 13:19:37 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-06-07 13:19:37 -0400 |
| commit | ae4515e9fc9d94897d65c1d85d340061b7f61d48 (patch) | |
| tree | 7f1c84e4e002cd0542b8bb1c3d24ade16e849970 | |
| parent | 42fe3ec1e2c41edb3699d8ac87b5dbeef016682c (diff) | |
| parent | d0d7d891abefaf747cb5203c1a3d91bb4481b6c0 (diff) | |
Merge branch 'joeyconfig'
| -rw-r--r-- | src/Propellor/DotDir.hs | 5 | ||||
| -rw-r--r-- | stack.yaml | 1 |
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 @@ -1,3 +1,4 @@ +# When updating the resolver here, also update stackResolver in Propellor.DotDir resolver: lts-5.10 packages: - '.' |