diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2019-11-02 12:31:24 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2019-11-02 12:31:24 -0400 |
| commit | a5de3052c084c84e7cf8ab6230dd63f855d371b9 (patch) | |
| tree | b8287fcdfc96b7f2b098c74cdf0db16475624929 | |
| parent | 819f452314c8cd75ad090e4f461d6a0032b68d5b (diff) | |
| download | guix-packages-a5de3052c084c84e7cf8ab6230dd63f855d371b9.tar.gz | |
git-annex: Drop custom definition
The upstream definition has S3 support as of ac1b080107.
| -rw-r--r-- | km-packages/git-annex.scm | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/km-packages/git-annex.scm b/km-packages/git-annex.scm index 1122b50..09de9da 100644 --- a/km-packages/git-annex.scm +++ b/km-packages/git-annex.scm @@ -52,30 +52,10 @@ newspace." (define (current-commit) (git-output "rev-parse" "HEAD")) -;; Upstream doesn't build with S3 support. -(define-public km-git-annex - (package - (inherit git-annex) - (name "km-git-annex") - (arguments - `(,@(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-aws" ,ghc-aws) - ,@(package-inputs git-annex))))) - (define-public git-annex-dev (let ((commit (current-commit))) (package - (inherit km-git-annex) + (inherit git-annex) (name "git-annex-dev") (version (string-append "000-" (string-take commit 7))) (source (local-file %source-dir |