1 files changed, 71 insertions, 14 deletions
diff --git a/kiki.cabal b/kiki.cabal
index 176d09c..a96eee9 100644
--- a/kiki.cabal
+++ b/kiki.cabal
@@ -1,7 +1,7 @@
 Name:                kiki
 Version:             0.0.3
-cabal-version:       >= 1.6
+cabal-version:       >= 1.8
 Synopsis:            A bridge between (cryptographic) keys
 Description:         gpg operations... TODO
 License:             Undecided
@@ -23,15 +23,20 @@ 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,
+                     asn1-encoding,
-                     openpgp-util -any,
+                     asn1-types,
-                     asn1-types -any, asn1-encoding -any,
+                     binary,
-                     dataenc -any, text -any, pretty -any, pretty-show -any,
+                     bytestring,
-                     bytestring -any, binary -any,
+                     containers,
-                     unix, time,
+                     dataenc,
-                     containers -any, process -any, filepath -any,
+                     directory,
-                     network -any, old-locale -any, zlib -any,
+                     filepath,
-                     tar
+                     tar,
+                     text,
+                     time,
+                     unix,
+                     openpgp-util,
+                     kiki
    if !flag(cryptonite)
      Build-Depends:   crypto-pubkey >=0.2.3, cryptohash -any,
                       crypto-pubkey-types -any
@@ -41,12 +46,64 @@ Executable kiki
        Build-Depends:   x509 <1.6
    else
      Build-Depends:   cryptonite, x509 >=1.6, memory, hourglass
-    ghc-options:     -O2 -fwarn-unused-binds -fwarn-unused-imports
-    c-sources: dotlock.c
 Executable hosts
    Main-is: hosts.hs
-    c-sources: dotlock.c
+    Build-Depends:   base >=4.6.0.0,
+                     bytestring,
+                     network,
+                     kiki
+Executable cokiki
+    Main-is: cokiki.hs
+    Build-Depends:   base >=4.6.0.0,
+                     bytestring,
+                     unix,
+                     kiki
 library
-    exposed-modules: KeyRing
+    hs-source-dirs:  lib
+    exposed-modules: KeyRing,
+                     Kiki,
+                     ScanningParser,
+                     PEM,
+                     DotLock,
+                     Base58,
+                     CryptoCoins,
+                     ProcessUtils,
+                     Hosts,
+                     CommandLine,
+                     Numeric.Interval,
+                     Numeric.Interval.Bounded,
+                     SuperOrd
+    other-modules:   TimeUtil,
+                     Compat,
+                     FunctorToMaybe
+    Build-Depends:   base >=4.6.0.0,
+                     asn1-encoding,
+                     asn1-types,
+                     binary,
+                     bytestring,
+                     containers,
+                     dataenc,
+                     directory,
+                     filepath,
+                     network,
+                     pretty-show,
+                     process,
+                     text,
+                     time,
+                     unix,
+                     zlib,
+                     openpgp-util
+    if !flag(cryptonite)
+      Build-Depends:   crypto-pubkey >=0.2.3, cryptohash -any,
+                       crypto-pubkey-types -any
+      if flag(hourglass)
+        Build-Depends:   hourglass -any, x509 >=1.5 && <1.6
+      else
+        Build-Depends:   x509 <1.6
+    else
+      Build-Depends:   cryptonite, x509 >=1.6, memory, hourglass
+    c-sources: lib/dotlock.c

diff --git a/kiki.cabal b/kiki.cabal index 176d09c..a96eee9 100644 --- a/kiki.cabal +++ b/kiki.cabal
@@ -1,7 +1,7 @@
1		1
2	Name: kiki	2	Name: kiki
3	Version: 0.0.3	3	Version: 0.0.3
4	cabal-version: >= 1.6	4	cabal-version: >= 1.8
5	Synopsis: A bridge between (cryptographic) keys	5	Synopsis: A bridge between (cryptographic) keys
6	Description: gpg operations... TODO	6	Description: gpg operations... TODO
7	License: Undecided	7	License: Undecided
@@ -23,15 +23,20 @@ Executable kiki
23	Main-is: kiki.hs	23	Main-is: kiki.hs
24	-- base >=4.6 due to use of readEither in KikiD.Message	24	-- base >=4.6 due to use of readEither in KikiD.Message
25	Build-Depends: base >=4.6.0.0,	25	Build-Depends: base >=4.6.0.0,
26	directory -any,	26	asn1-encoding,
27	openpgp-util -any,	27	asn1-types,
28	asn1-types -any, asn1-encoding -any,	28	binary,
29	dataenc -any, text -any, pretty -any, pretty-show -any,	29	bytestring,
30	bytestring -any, binary -any,	30	containers,
31	unix, time,	31	dataenc,
32	containers -any, process -any, filepath -any,	32	directory,
33	network -any, old-locale -any, zlib -any,	33	filepath,
34	tar	34	tar,
		35	text,
		36	time,
		37	unix,
		38	openpgp-util,
		39	kiki
35	if !flag(cryptonite)	40	if !flag(cryptonite)
36	Build-Depends: crypto-pubkey >=0.2.3, cryptohash -any,	41	Build-Depends: crypto-pubkey >=0.2.3, cryptohash -any,
37	crypto-pubkey-types -any	42	crypto-pubkey-types -any
@@ -41,12 +46,64 @@ Executable kiki
41	Build-Depends: x509 <1.6	46	Build-Depends: x509 <1.6
42	else	47	else
43	Build-Depends: cryptonite, x509 >=1.6, memory, hourglass	48	Build-Depends: cryptonite, x509 >=1.6, memory, hourglass
44	ghc-options: -O2 -fwarn-unused-binds -fwarn-unused-imports
45	c-sources: dotlock.c
46		49
47	Executable hosts	50	Executable hosts
48	Main-is: hosts.hs	51	Main-is: hosts.hs
49	c-sources: dotlock.c	52	Build-Depends: base >=4.6.0.0,
		53	bytestring,
		54	network,
		55	kiki
		56
		57	Executable cokiki
		58	Main-is: cokiki.hs
		59	Build-Depends: base >=4.6.0.0,
		60	bytestring,
		61	unix,
		62	kiki
50		63
51	library	64	library
52	exposed-modules: KeyRing	65	hs-source-dirs: lib
		66	exposed-modules: KeyRing,
		67	Kiki,
		68	ScanningParser,
		69	PEM,
		70	DotLock,
		71	Base58,
		72	CryptoCoins,
		73	ProcessUtils,
		74	Hosts,
		75	CommandLine,
		76	Numeric.Interval,
		77	Numeric.Interval.Bounded,
		78	SuperOrd
		79	other-modules: TimeUtil,
		80	Compat,
		81	FunctorToMaybe
		82
		83	Build-Depends: base >=4.6.0.0,
		84	asn1-encoding,
		85	asn1-types,
		86	binary,
		87	bytestring,
		88	containers,
		89	dataenc,
		90	directory,
		91	filepath,
		92	network,
		93	pretty-show,
		94	process,
		95	text,
		96	time,
		97	unix,
		98	zlib,
		99	openpgp-util
		100	if !flag(cryptonite)
		101	Build-Depends: crypto-pubkey >=0.2.3, cryptohash -any,
		102	crypto-pubkey-types -any
		103	if flag(hourglass)
		104	Build-Depends: hourglass -any, x509 >=1.5 && <1.6
		105	else
		106	Build-Depends: x509 <1.6
		107	else
		108	Build-Depends: cryptonite, x509 >=1.6, memory, hourglass
		109	c-sources: lib/dotlock.c