nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

guix package: Allow separate install of several outputs of the same package. 

* guix/scripts/package.scm (guix-package)[process-actions](same-package?):
  New procedure.  Use it instead of `alist-delete' when filtering out
  duplicate packages from the profile.
This commit is contained in:
Ludovic Courtès 2013-07-15 23:33:17 +02:00
parent 56fbf2629f
commit 079d127391
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
guix/scripts/package.scm
View File

@ -693,6 +693,12 @@ more information.~%"))
(delete-duplicates deps same?)) (delete-duplicates deps same?))
(define (same-package? tuple name out)
(match tuple
((tuple-name _ tuple-output _ ...)
(and (equal? name tuple-name)
(equal? out tuple-output)))))
(define (package->tuple p) (define (package->tuple p)
;; Convert package P to a tuple. ;; Convert package P to a tuple.
;; When given a package via `-e', install the first of its ;; When given a package via `-e', install the first of its
@ -816,8 +822,11 @@ more information.~%"))
(packages (append install* (packages (append install*
(fold (lambda (package result) (fold (lambda (package result)
(match package (match package
((name _ ...) ((name _ out _ ...)
(alist-delete name result)))) (filter (negate
(cut same-package? <>
name out))
result))))
(fold alist-delete installed remove) (fold alist-delete installed remove)
install*)))) install*))))