guix_mirror_bot pushed a commit to branch r-team
in repository guix.
commit 69c85d83561ce56aba445332a2f65aeb4a61f926
Author: Ricardo Wurmus <[email protected]>
AuthorDate: Tue Feb 17 09:18:00 2026 +0100
import/cran: Uniquify inputs.
* guix/import/cran.scm (cran-package-inputs): Deduplicate inputs from
different sources.
Change-Id: I4547c9645f2722b451e003db2b87a77f6f4d304d
---
guix/import/cran.scm | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index e03f51d473..90d26b26d0 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -798,18 +798,21 @@ of META, a package in REPOSITORY."
(filter-map (lambda (name)
(and (not (member name invalid-packages))
(upstream-input
- (name name)
- (downstream-name
- (transform-sysname name)))))
+ (name name)
+ (downstream-name
+ (transform-sysname name)))))
(map string-downcase
- (listify meta "SystemRequirements")))))
+ (listify meta "SystemRequirements"))))
+ (unique-inputs
+ (set->list (fold set-insert (set)
+ (append source-derived-inputs
+ system-inputs
+ r-inputs))) ))
(sort (filter
;; Prevent tight cycles.
(lambda (input)
((negate string=?) name (upstream-input-name input)))
- (append source-derived-inputs
- system-inputs
- r-inputs))
+ unique-inputs)
compare-upstream-inputs)))
(define (phases-for-inputs input-names)
