me
/
guix
Archived
1
0
Fork 0

self: Factorize package dependency enumeration.

* guix/self.scm (transitive-package-dependencies): New procedure.
(compiled-guix)[dependencies]: Use it.
master
Ludovic Courtès 2020-12-03 14:34:26 +01:00
parent 720e87fe91
commit fbb380a088
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 11 additions and 8 deletions

View File

@ -777,6 +777,13 @@ Info manual."
(copy-recursively #$miscellany #$output (copy-recursively #$miscellany #$output
#:log (%make-void-port "w"))))))) #:log (%make-void-port "w")))))))
(define (transitive-package-dependencies package)
"Return the list of packages propagated by PACKAGE, including PACKAGE
itself."
(match (package-transitive-propagated-inputs package)
(((labels packages _ ...) ...)
(cons package packages))))
(define* (compiled-guix source #:key (version %guix-version) (define* (compiled-guix source #:key (version %guix-version)
(pull-version 1) (pull-version 1)
(name (string-append "guix-" version)) (name (string-append "guix-" version))
@ -818,14 +825,10 @@ Info manual."
(specification->package "gnutls")) (specification->package "gnutls"))
(define dependencies (define dependencies
(match (append-map (lambda (package) (append-map transitive-package-dependencies
(cons (list "x" package) (list guile-gcrypt gnutls guile-git guile-avahi
(package-transitive-propagated-inputs package))) guile-json guile-semver guile-ssh guile-sqlite3
(list guile-gcrypt gnutls guile-git guile-avahi guile-zlib guile-lzlib)))
guile-json guile-semver guile-ssh guile-sqlite3
guile-zlib guile-lzlib))
(((labels packages _ ...) ...)
packages)))
(define *core-modules* (define *core-modules*
(scheme-node "guix-core" (scheme-node "guix-core"