summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-05-20 19:49:07 -0400
committerJoey Hess2014-05-20 19:49:07 -0400
commiteeb2d688bdf435158929bb3cbfea6fb68076de9e (patch)
treed0aa240b426c34f610b87d3529b581bae2bb2fcf
parent1fa9a382282d0d444b7fdf796bc51ce5f8926e7d (diff)
propellor spin
-rw-r--r--config-joey.hs5
-rw-r--r--src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs9
2 files changed, 10 insertions, 4 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 9972d5db..f495004e 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -196,6 +196,7 @@ hosts = -- (o) `
-- to have the same versions of all haskell libraries installed.
, Docker.container "armel-git-annex-builder-companion"
(image $ System (Debian Unstable) "amd64")
+ & Apt.stdSourcesList Unstable
& Apt.unattendedUpgrades
-- This volume is shared with the armel builder.
& Docker.volume GitAnnexBuilder.homedir
@@ -211,6 +212,7 @@ hosts = -- (o) `
& GitAnnexBuilder.sshKeyGen
, Docker.container "armel-git-annex-builder"
(image $ System (Debian Unstable) "armel")
+ & Apt.stdSourcesList Unstable
& Apt.unattendedUpgrades
& Apt.installed ["openssh-client"]
& Docker.link "armel-git-annex-builder-companion" "companion"
@@ -225,8 +227,9 @@ hosts = -- (o) `
standardGitAnnexBuilder :: Architecture -> Int -> GitAnnexBuilder.TimeOut -> Host
standardGitAnnexBuilder arch buildminute timeout = Docker.container (arch ++ "-git-annex-builder")
(image $ System (Debian Unstable) arch)
- & GitAnnexBuilder.builder arch (show buildminute ++ " * * * *") timeout True
+ & Apt.stdSourcesList Unstable
& Apt.unattendedUpgrades
+ & GitAnnexBuilder.builder arch (show buildminute ++ " * * * *") timeout True
-- This is my standard system setup.
standardSystem :: HostName -> DebianSuite -> Architecture -> Host
diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
index 0cd5d3c5..428b3d00 100644
--- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
+++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
@@ -69,8 +69,7 @@ tree buildarch = combineProperties "gitannexbuilder tree"
buildDeps :: Property
buildDeps = combineProperties "gitannexbuilder build deps"
- [ Apt.stdSourcesList Unstable
- , Apt.buildDep ["git-annex"]
+ [ Apt.buildDep ["git-annex"]
, buildDepsNoHaskellLibs
, "git-annex source build deps installed" ==> Apt.buildDepIn builddir
]
@@ -78,7 +77,11 @@ buildDeps = combineProperties "gitannexbuilder build deps"
buildDepsNoHaskellLibs :: Property
buildDepsNoHaskellLibs = Apt.installed ["git", "rsync", "moreutils", "ca-certificates",
"debhelper", "ghc", "curl", "openssh-client", "git-remote-gcrypt",
- "liblockfile-simple-perl", "cabal-install", "vim", "less"]
+ "liblockfile-simple-perl", "cabal-install", "vim", "less",
+ "alex", "happy", "c2hs",
+ -- these haskell libs depend on C libs and don't use TH
+ "libghc-dbus-dev", "libghc-fdo-notify-dev", "libghc-network-protocol-xmpp-dev"
+ ]
-- Installs current versions of git-annex's deps from cabal, but only
-- does so once.