From eeb2d688bdf435158929bb3cbfea6fb68076de9e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 20 May 2014 19:49:07 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src') 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. -- cgit v1.2.3