Skip to content

Instantly share code, notes, and snippets.

@aroig
Created January 2, 2017 10:16
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save aroig/100c2977b6df8a2109823b715647d5fb to your computer and use it in GitHub Desktop.
Save aroig/100c2977b6df8a2109823b715647d5fb to your computer and use it in GitHub Desktop.
Fix crypto-api dependency for git-annex
From 81748d4edcbebcbe4e1e90899010d3ac696fe577 Mon Sep 17 00:00:00 2001
From: Abdo Roig-Maranges <abdo.roig@gmail.com>
Date: Mon, 2 Jan 2017 09:39:17 +0100
Subject: [PATCH] Make crypto-api a global dependency
Since af4d9197 it is needed by Utility.AuthToken. Otherwise, the
builds without webapp and testsuite are broken.
---
git-annex.cabal | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/git-annex.cabal b/git-annex.cabal
index 5b95a16b7..bb5383e1b 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -361,7 +361,8 @@ Executable git-annex
socks,
byteable,
stm-chans,
- securemem
+ securemem,
+ crypto-api
CC-Options: -Wall
GHC-Options: -Wall -fno-warn-tabs
Extensions: PackageImports
@@ -397,8 +398,7 @@ Executable git-annex
Other-Modules: Utility.Touch.Old
if flag(TestSuite)
- Build-Depends: tasty (>= 0.7), tasty-hunit, tasty-quickcheck, tasty-rerun,
- crypto-api
+ Build-Depends: tasty (>= 0.7), tasty-hunit, tasty-quickcheck, tasty-rerun
CPP-Options: -DWITH_TESTSUITE
if flag(S3)
@@ -461,7 +461,6 @@ Executable git-annex
wai,
wai-extra,
blaze-builder,
- crypto-api,
clientsession,
template-haskell,
shakespeare (>= 2.0.0)
--
2.11.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment