From 23006356b933a9f9c1b357c14b66a997903216a5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 24 Feb 2017 20:56:26 -0400 Subject: 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. --- git-annex.cabal | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'git-annex.cabal') 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) -- cgit v1.2.3