summaryrefslogtreecommitdiff
path: root/git-annex.cabal
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-02-24 20:56:26 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-02-24 20:56:26 -0400
commit23006356b933a9f9c1b357c14b66a997903216a5 (patch)
tree3d510842ff944dad21398f0a08b14521a7da5c54 /git-annex.cabal
parent3e28f10759a3f6e7a5cf947db0c975b70151e6f7 (diff)
Removed support for building with the old cryptohash library.
Building with that library made git-annex not support SHA3; it's time for that to always be supported in case SHA2 dominoes.
Diffstat (limited to 'git-annex.cabal')
-rw-r--r--git-annex.cabal12
1 files changed, 2 insertions, 10 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index 87c14939c..ecee55dd9 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -295,9 +295,6 @@ Flag network-uri
Description: Get Network.URI from the network-uri package
Default: True
-Flag Cryptonite
- Description: Use the cryptonite library, instead of the older cryptohash
-
Flag Dbus
Description: Enable dbus support
@@ -362,7 +359,8 @@ Executable git-annex
byteable,
stm-chans,
securemem,
- crypto-api
+ crypto-api,
+ cryptonite
CC-Options: -Wall
GHC-Options: -Wall -fno-warn-tabs
Extensions: PackageImports
@@ -383,12 +381,6 @@ Executable git-annex
else
Build-Depends: network (< 2.6), network (>= 2.4)
- if flag(Cryptonite)
- Build-Depends: cryptonite
- CPP-Options: -DWITH_CRYPTONITE
- else
- Build-Depends: cryptohash (>= 0.11.0)
-
if (os(windows))
Build-Depends: Win32, Win32-extras, unix-compat (>= 0.4.1.3), setenv,
process (>= 1.3.0.0)