summaryrefslogtreecommitdiff
path: root/propellor.cabal
diff options
context:
space:
mode:
authorDaniel Brooks2015-08-02 00:59:28 -0400
committerDaniel Brooks2015-08-02 00:59:28 -0400
commiteb15f06896aeb208d19f6f322905c7782125356e (patch)
tree6f28ac50e476e83b212e2827a10d4b6dee0730c9 /propellor.cabal
parent65b511e2d4f4ec9864167e414e76b967eda32dba (diff)
parentb7a9655a695103b3ca2e4e6edfe305f9b44d9250 (diff)
Merge branch 'joeyconfig' of git://git.kitenet.net/propellor into joeyconfig
Conflicts: src/Propellor/Property/SiteSpecific/IABak.hs
Diffstat (limited to 'propellor.cabal')
-rw-r--r--propellor.cabal7
1 files changed, 4 insertions, 3 deletions
diff --git a/propellor.cabal b/propellor.cabal
index 16dffe31..01c867c8 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -1,6 +1,6 @@
Name: propellor
-Version: 2.4.0
-Cabal-Version: >= 1.6
+Version: 2.7.0
+Cabal-Version: >= 1.8
License: BSD3
Maintainer: Joey Hess <id@joeyh.name>
Author: Joey Hess
@@ -38,7 +38,7 @@ Executable propellor
Build-Depends: MissingH, directory, filepath, base >= 4.5, base < 5,
IfElse, process, bytestring, hslogger, unix-compat, ansi-terminal,
containers, network, async, time, QuickCheck, mtl, transformers,
- exceptions
+ exceptions (>= 0.6)
if (! os(windows))
Build-Depends: unix
@@ -121,6 +121,7 @@ Library
Propellor.Exception
Propellor.Types
Propellor.Types.Chroot
+ Propellor.Types.Container
Propellor.Types.Docker
Propellor.Types.Dns
Propellor.Types.Empty