diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-01-25 15:16:58 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-25 15:16:58 -0400 |
| commit | 401b857eef13ca7d3f7b8f6b88e9237884fcd906 (patch) | |
| tree | eb4b5c189349b5a86b3b39edbe039956d3a1a3b8 /propellor.cabal | |
| parent | 1df70ba81ddfbd4ceeb5344793f7714a35706c8f (diff) | |
| parent | cdd88b080af534231aae8a64ef327f0597a5b5b3 (diff) | |
Merge branch 'joeyconfig'
Conflicts:
doc/todo/info_propigation_out_of_nested_properties.mdwn
privdata.joey/privdata.gpg
Diffstat (limited to 'propellor.cabal')
| -rw-r--r-- | propellor.cabal | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/propellor.cabal b/propellor.cabal index 982df527..523cf19f 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -85,6 +85,7 @@ Library Propellor.Property.Gpg Propellor.Property.Group Propellor.Property.Grub + Propellor.Property.Journald Propellor.Property.Mount Propellor.Property.Network Propellor.Property.Nginx @@ -94,6 +95,7 @@ Library Propellor.Property.Postfix Propellor.Property.Prosody Propellor.Property.Reboot + Propellor.Property.List Propellor.Property.Scheduled Propellor.Property.Service Propellor.Property.Ssh @@ -108,7 +110,7 @@ Library Propellor.Property.SiteSpecific.GitHome Propellor.Property.SiteSpecific.JoeySites Propellor.Property.SiteSpecific.GitAnnexBuilder - Propellor.Host + Propellor.PropAccum Propellor.CmdLine Propellor.Info Propellor.Message @@ -122,6 +124,9 @@ Library Propellor.Types.Empty Propellor.Types.OS Propellor.Types.PrivData + Propellor.Types.Val + Propellor.Types.Result + Propellor.Types.CmdLine Other-Modules: Propellor.Git Propellor.Gpg @@ -133,11 +138,13 @@ Library Propellor.Property.Chroot.Util Utility.Applicative Utility.Data + Utility.DataUnits Utility.Directory Utility.Env Utility.Exception Utility.FileMode Utility.FileSystemEncoding + Utility.HumanNumber Utility.LinuxMkLibs Utility.Misc Utility.Monad |