From 924fd74fd48f83a6061330db6013a0c7419e83a1 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Sat, 13 Jul 2019 15:03:50 -0400 Subject: remove cryptonite flag; always use cryptonite --- kiki.cabal | 33 +++------------------------------ 1 file 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 --Homepage: TODO build-type: Simple -Flag cryptonite - Description: Use newer cryptonite-based x509 version 1.6 and higher - Default: True - -Flag hourglass - Description: Use newer hourglass-based x509 version 1.5 and higher - Default: True - Flag needlocale Description: Link against old-locale package for older versions of the time package. Default: False @@ -47,15 +39,7 @@ Executable kiki pretty-show, kiki other-modules: DNSKey - if !flag(cryptonite) - Build-Depends: crypto-pubkey >=0.2.3, cryptohash -any, - crypto-pubkey-types -any, dataenc - 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 + Build-Depends: cryptonite, x509 >=1.6, memory, hourglass Executable hosts Main-is: hosts.hs @@ -128,15 +112,7 @@ library else build-depends: time >= 1.5 - if !flag(cryptonite) - Build-Depends: crypto-pubkey >=0.2.3, cryptohash -any, - crypto-pubkey-types -any, dataenc - 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 + Build-Depends: cryptonite, x509 >=1.6, memory, hourglass c-sources: lib/dotlock.c Test-suite testkiki @@ -152,10 +128,7 @@ Test-suite testkiki , bytestring , time , kiki - if !flag(cryptonite) - Build-Depends: cryptohash - else - Build-Depends: cryptonite, memory + Build-Depends: cryptonite, memory if flag(unixEnv) Build-depends: base < 4.7.0, unix else -- cgit v1.2.3