Updated build.

1 files changed, 11 insertions, 19 deletions

diff --git a/kiki.cabal b/kiki.cabal
index 450a3ab..e301d7f 100644
--- a/kiki.cabal
+++ b/kiki.cabal
@@ -11,21 +11,28 @@ Maintainer:          Joseph Crayne <oh.hello.joe@gmail.com>
 --Homepage:          TODO
 build-type:          Simple
 
+Flag cryptonite
+  Description: Use newer cryptonite-based x509 version 1.6 and higher
+  Default: True
+
 Executable kiki
     Main-is: kiki.hs
     -- base >=4.6 due to use of readEither in KikiD.Message
     Build-Depends:   base >=4.6.0.0,
                      directory -any,
                      openpgp-util -any,
-                     crypto-pubkey (>=0.2.3), cryptohash -any,
-                     crypto-pubkey-types -any,
-                     x509 (< 1.6), asn1-types -any, asn1-encoding -any,
+                     asn1-types -any, asn1-encoding -any,
                      dataenc -any, text -any, pretty -any, pretty-show -any,
-                     bytestring -any, openpgp (>=0.6.1.1), binary -any,
+                     bytestring -any, binary -any,
                      unix, time, 
                      containers -any, process -any, filepath -any,
                      network -any, old-locale -any, zlib -any,
                      hourglass -any
+    if !flag(cryptonite)
+      Build-Depends:   crypto-pubkey >=0.2.3, cryptohash -any,
+                       crypto-pubkey-types -any, x509 <1.6
+    else
+      Build-Depends:   cryptonite, x509 >=1.6, memory
     ghc-options:     -O2 -fwarn-unused-binds -fwarn-unused-imports
     c-sources: dotlock.c
 
@@ -33,20 +40,5 @@ Executable hosts
     Main-is: hosts.hs
     c-sources: dotlock.c
 
-Executable kikid
-    Main-is: kikid.hs
-    Build-Depends: base -any, 
-                   --kiki >=0.0.3,
-                   hdaemonize >= 0.5, 
-                   hsyslog -any,
-                   async >= 2.0.0,
-                   stm-chans >= 2.0.0,
-                   network >= 2.4 && < 3.0, 
-                   monad-loops -any,
-                   HTTP -any,
-                   stm >= 2.3,
-                   cereal -any,
-                   bytes -any
-
 library
     exposed-modules: KeyRing