aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2019-09-03 18:36:00 -0400
committerKyle Meyer <kyle@kyleam.com>2019-09-03 18:36:00 -0400
commit5ffcee8d5ac6ca91b7b05f5e7a586d5c965081e9 (patch)
tree8efe8b54644a1bbb9810b8d8019e40be6ec7d0aa
parent0d393911ddb1ef2887ac24eb3cd087636d115a00 (diff)
downloadguix-packages-5ffcee8d5ac6ca91b7b05f5e7a586d5c965081e9.tar.gz
git-annex: Enable S3
-rw-r--r--km-packages/git-annex.scm16
1 files changed, 12 insertions, 4 deletions
diff --git a/km-packages/git-annex.scm b/km-packages/git-annex.scm
index aa410ac..1b55fc3 100644
--- a/km-packages/git-annex.scm
+++ b/km-packages/git-annex.scm
@@ -22,6 +22,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages haskell)
#:use-module (gnu packages haskell-apps)
+ #:use-module (gnu packages haskell-xyz)
#:use-module (gnu packages ipfs)
#:use-module (guix build utils)
#:use-module (guix build-system trivial)
@@ -77,7 +78,7 @@ full-featured binding.")
;; TODO: check
(license license:bsd-2)))
-;; Upstream doesn't use ghc-magic yet.
+;; Upstream doesn't use ghc-magic yet and disables S3 support.
(define-public km-git-annex
(package
(inherit git-annex)
@@ -92,12 +93,19 @@ full-featured binding.")
(base32
"16mya2dm7q9ggdmwyszri85qnnxf0l71xnn8khnxl5fqrh2zvsjg"))))
(arguments
- `(#:tests? #f
- ,@(substitute-keyword-arguments (package-arguments git-annex)
+ `(,@(substitute-keyword-arguments (package-arguments git-annex)
+ ((#:tests? _ #f) #f)
+ ((#:configure-flags _)
+ ;; These are the same flags that upstream uses, dropping
+ ;; -S3. If this change doesn't move upstream soon, I
+ ;; should future-proof this by slicing "-S3" from the
+ ;; upstream flags rather than doing a full replacement.
+ '(list "--flags=-Android -Assistant -Pairing -Webapp -WebDAV"))
((#:phases phases)
`(modify-phases ,phases
(delete 'check))))))
- (inputs `(("ghc-magic" ,ghc-magic)
+ (inputs `(("ghc-aws" ,ghc-aws)
+ ("ghc-magic" ,ghc-magic)
,@(package-inputs git-annex)))))
(define-public git-annex-dev