aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2019-09-03 18:35:04 -0400
committerKyle Meyer <kyle@kyleam.com>2019-09-03 18:35:04 -0400
commit0d393911ddb1ef2887ac24eb3cd087636d115a00 (patch)
treef512430776e43108a3455011917c42288e8edd43
parent7d70d3cc77af4e0e275ec7f2d7a89f78a5b789ba (diff)
downloadguix-packages-0d393911ddb1ef2887ac24eb3cd087636d115a00.tar.gz
git-annex-dev: Inherit from km-git-annex
... to avoid duplicating modifications.
-rw-r--r--km-packages/git-annex.scm10
1 files changed, 3 insertions, 7 deletions
diff --git a/km-packages/git-annex.scm b/km-packages/git-annex.scm
index d8efb18..aa410ac 100644
--- a/km-packages/git-annex.scm
+++ b/km-packages/git-annex.scm
@@ -103,15 +103,14 @@ full-featured binding.")
(define-public git-annex-dev
(let ((commit (current-commit)))
(package
- (inherit git-annex)
+ (inherit km-git-annex)
(name "git-annex-dev")
(version (string-append "000-" (string-take commit 7)))
(source (local-file %source-dir
#:recursive? #t
#:select? (git-predicate %source-dir)))
(arguments
- `(#:tests? #f
- ,@(substitute-keyword-arguments (package-arguments git-annex)
+ `(,@(substitute-keyword-arguments (package-arguments git-annex)
((#:phases phases)
`(modify-phases ,phases
(add-before 'factor-setup 'delete-setup
@@ -119,14 +118,11 @@ full-featured binding.")
;; Otherwise get write error because is read-only.
(delete-file "Setup.hs")
#t))
- (delete 'check)
(add-before 'unpatch-shell-and-rebuild 'delete-shell
(lambda _
;; Avoid permission error when copying file.
(delete-file "Utility/Shell.hs")
- #t)))))))
- (inputs `(("ghc-magic" ,ghc-magic)
- ,@(package-inputs git-annex))))))
+ #t))))))))))
(define-public git-annex-remote-ipfs
(package