propellor spin

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

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.