summaryrefslogtreecommitdiff
path: root/kiki.cabal
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2019-07-13 15:03:50 -0400
committerAndrew Cady <d@jerkface.net>2019-07-13 15:12:52 -0400
commit924fd74fd48f83a6061330db6013a0c7419e83a1 (patch)
tree8d3ec0e77d5f8a70d57ff37e2dc2fba9a430b143 /kiki.cabal
parent29a3e765236340f5c19c92de7913d3a1997fcd5b (diff)
remove cryptonite flag; always use cryptonite
Diffstat (limited to 'kiki.cabal')
-rw-r--r--kiki.cabal33
1 files changed, 3 insertions, 30 deletions
diff --git a/kiki.cabal b/kiki.cabal
index 5bf6c34..f25b5a3 100644
--- a/kiki.cabal
+++ b/kiki.cabal
@@ -11,14 +11,6 @@ Maintainer: Joseph Crayne <oh.hello.joe@gmail.com>
11--Homepage: TODO 11--Homepage: TODO
12build-type: Simple 12build-type: Simple
13 13
14Flag cryptonite
15 Description: Use newer cryptonite-based x509 version 1.6 and higher
16 Default: True
17
18Flag hourglass
19 Description: Use newer hourglass-based x509 version 1.5 and higher
20 Default: True
21
22Flag needlocale 14Flag needlocale
23 Description: Link against old-locale package for older versions of the time package. 15 Description: Link against old-locale package for older versions of the time package.
24 Default: False 16 Default: False
@@ -47,15 +39,7 @@ Executable kiki
47 pretty-show, 39 pretty-show,
48 kiki 40 kiki
49 other-modules: DNSKey 41 other-modules: DNSKey
50 if !flag(cryptonite) 42 Build-Depends: cryptonite, x509 >=1.6, memory, hourglass
51 Build-Depends: crypto-pubkey >=0.2.3, cryptohash -any,
52 crypto-pubkey-types -any, dataenc
53 if flag(hourglass)
54 Build-Depends: hourglass -any, x509 >=1.5 && <1.6
55 else
56 Build-Depends: x509 <1.6
57 else
58 Build-Depends: cryptonite, x509 >=1.6, memory, hourglass
59 43
60Executable hosts 44Executable hosts
61 Main-is: hosts.hs 45 Main-is: hosts.hs
@@ -128,15 +112,7 @@ library
128 else 112 else
129 build-depends: time >= 1.5 113 build-depends: time >= 1.5
130 114
131 if !flag(cryptonite) 115 Build-Depends: cryptonite, x509 >=1.6, memory, hourglass
132 Build-Depends: crypto-pubkey >=0.2.3, cryptohash -any,
133 crypto-pubkey-types -any, dataenc
134 if flag(hourglass)
135 Build-Depends: hourglass -any, x509 >=1.5 && <1.6
136 else
137 Build-Depends: x509 <1.6
138 else
139 Build-Depends: cryptonite, x509 >=1.6, memory, hourglass
140 c-sources: lib/dotlock.c 116 c-sources: lib/dotlock.c
141 117
142Test-suite testkiki 118Test-suite testkiki
@@ -152,10 +128,7 @@ Test-suite testkiki
152 , bytestring 128 , bytestring
153 , time 129 , time
154 , kiki 130 , kiki
155 if !flag(cryptonite) 131 Build-Depends: cryptonite, memory
156 Build-Depends: cryptohash
157 else
158 Build-Depends: cryptonite, memory
159 if flag(unixEnv) 132 if flag(unixEnv)
160 Build-depends: base < 4.7.0, unix 133 Build-depends: base < 4.7.0, unix
161 else 134 else