From 8480a2a5bb360b432877dd33dca80a61c5a698eb Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 7 Sep 2021 13:05:56 +0200 Subject: import: minetest: Delete duplicate dependencies. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes one of the issues noted in . * guix/import/minetest.scm (import-dependencies): Call 'delete-duplicates' on the resulting list. * tests/minetest.scm ("minetest->guix-package, multiple dependencies implemented by one mod"): New test. Signed-off-by: Ludovic Courtès --- guix/import/minetest.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'guix/import') diff --git a/guix/import/minetest.scm b/guix/import/minetest.scm index e1f8487b75..c8209aba79 100644 --- a/guix/import/minetest.scm +++ b/guix/import/minetest.scm @@ -371,7 +371,11 @@ official Minetest forum and the Git repository (if any)." DEPENDENCIES as a list of AUTHOR/NAME strings." (define dependency-list (assoc-ref dependencies author/name)) - (filter-map + ;; A mod can have multiple dependencies implemented by the same mod, + ;; so remove duplicate mod names. + (define (filter-deduplicate-map f list) + (delete-duplicates (filter-map f list))) + (filter-deduplicate-map (lambda (dependency) (and (not (dependency-optional? dependency)) (not (builtin-mod? (dependency-name dependency))) -- cgit v1.2.3