summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
diff options
context:
space:
mode:
authorJoey Hess2015-04-28 16:01:19 -0400
committerJoey Hess2015-04-28 16:01:19 -0400
commitb4877efea5375cb83951d6dd1d3dbf9d70208cf8 (patch)
treeb36d7b691cddf3e62eb6a1003d88bd8d7f48dab8 /src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
parent6ec8bf6b20aa33b1f55879b41f75b1470504f74e (diff)
parent960745b95e96e3d276e275554584c9bd13565f5b (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs')
-rw-r--r--src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
index 384b2724..511fd888 100644
--- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
+++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
@@ -142,7 +142,7 @@ androidContainer dockerImage name setupgitannexdir gitannexdir = Docker.containe
haskellpkgsinstalled = userScriptProperty (User builduser)
[ "cd " ++ gitannexdir ++ " && ./standalone/android/install-haskell-packages"
]
- osver = System (Debian Testing) "i386" -- once jessie is released, use: (Stable "jessie")
+ osver = System (Debian Testing) "i386"
-- armel builder has a companion container using amd64 that
-- runs the build first to get TH splices. They need