summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2014-05-26 18:46:42 -0400
committerJoey Hess2014-05-26 18:46:42 -0400
commit9fa0393f386977637fe16e93f31b835cc457d87d (patch)
tree6a49aa0c56dfbcbecea85817bbd08cc9dc3b4b96 /src/Propellor
parente71bed664002a577c1dab6a411fbaaaf76383de6 (diff)
propellor spin
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs25
1 files changed, 14 insertions, 11 deletions
diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
index b8729871..a154c926 100644
--- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
+++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
@@ -75,22 +75,25 @@ tree buildarch = combineProperties "gitannexbuilder tree"
buildDeps :: Property
buildDeps = combineProperties "gitannexbuilder build deps"
[ Apt.buildDep ["git-annex"]
- , buildDepsNoHaskellLibs
+ , buildDepsFewHaskellLibs
, "git-annex source build deps installed" ==> Apt.buildDepIn builddir
]
+buildDepsFewHaskellLibs :: Property
+buildDepsFewHaskellLibs = combineProperties "gitannexbuilder build deps"
+ [ buildDepsNoHaskellLibs
+ -- these haskell libs depend on C libs and don't use TH
+ , Apt.installed ["libghc-dbus-dev", "libghc-fdo-notify-dev", "libghc-network-protocol-xmpp-dev"]
+ ]
+
buildDepsNoHaskellLibs :: Property
-buildDepsNoHaskellLibs = Apt.installed ["git", "rsync", "moreutils", "ca-certificates",
+buildDepsNoHaskellLibs = Apt.installed
+ ["git", "rsync", "moreutils", "ca-certificates",
"debhelper", "ghc", "curl", "openssh-client", "git-remote-gcrypt",
"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"
+ "alex", "happy", "c2hs"
]
-noBuildDeps :: Property
-noBuildDeps = propertyList "no build deps" []
-
-- Installs current versions of git-annex's deps from cabal, but only
-- does so once.
cabalDeps :: Property
@@ -112,7 +115,7 @@ androidContainer dockerImage crontimes timeout = Docker.container "android-git-a
(dockerImage $ System (Debian Stable) "i386")
& Apt.stdSourcesList Stable
& Apt.unattendedUpgrades
- & builder' noBuildDeps "android" crontimes timeout True
+ & builder' buildDepsNoHaskellLibs "android" crontimes timeout True
& flagFile chrootsetup ("/chrootsetup")
-- TODO: automate installing haskell libs
-- (Currently have to run
@@ -138,7 +141,7 @@ armelCompanionContainer dockerImage = Docker.container "armel-git-annex-builder-
& Docker.volume gitbuilderdir
-- Install current versions of build deps from cabal.
& tree "armel"
- & buildDepsNoHaskellLibs
+ & buildDepsFewHaskellLibs
& cabalDeps
-- The armel builder can ssh to this companion.
& Docker.expose "22"
@@ -157,7 +160,7 @@ armelContainer dockerImage crontimes timeout = Docker.container "armel-git-annex
-- (Currently have to run
-- git-annex/standalone/linux/install-haskell-packages
-- which is not fully automated.)
- & builder' buildDepsNoHaskellLibs "armel" crontimes timeout True
+ & builder' buildDepsFewHaskellLibs "armel" crontimes timeout True
& Ssh.keyImported SshRsa builduser
& trivial writecompanionaddress
where