diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2026-02-17 09:18:00 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2026-03-07 11:57:24 +0100 |
| commit | d2c5f0fd59c68c394b2a286d2ae9398e76123a7f (patch) | |
| tree | 8be58cbb9b772087149d46e431a5394b7d051b4e | |
| parent | 647958d69a8bb94011c8ad216ec82f6bb3498f2a (diff) | |
import/cran: Uniquify inputs.
* guix/import/cran.scm (cran-package-inputs): Deduplicate inputs from
different sources.
Change-Id: I4547c9645f2722b451e003db2b87a77f6f4d304d
| -rw-r--r-- | guix/import/cran.scm | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/guix/import/cran.scm b/guix/import/cran.scm index e03f51d4739..90d26b26d01 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) |