From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark H Weaver Subject: [PATCH] Inhibit duplicates in fold-packages Date: Tue, 12 Feb 2013 20:50:35 -0500 Message-ID: <87d2w5q8wk.fsf@tines.lan> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([208.118.235.92]:45947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5RUs-0007S0-Py for bug-guix@gnu.org; Tue, 12 Feb 2013 20:50:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U5RUp-0000DF-DI for bug-guix@gnu.org; Tue, 12 Feb 2013 20:50:54 -0500 Received: from world.peace.net ([96.39.62.75]:45180) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5RUo-0000CR-WA for bug-guix@gnu.org; Tue, 12 Feb 2013 20:50:51 -0500 List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org To: bug-guix@gnu.org --=-=-= Content-Type: text/plain Here's a patch to inhibit the same package (in the sense of eq?) from being traversed more than once by fold-packages. One example where this helps is the guile-2.0 package in (gnu packages guile), which is exported in two different variables: guile-2.0 and guile-2.0/fixed. Note that even after applying this patch, there are still cases where "guix-package -A ." produces the same output twice, but that's a different problem. In the remaining cases, there are actually two distinct package objects being printed the same way because the 'location' field is inherited from one package to another. For example this happens with the 'gcc-boot0' and 'gcc-4.7' packages in (gnu packages base). What do you think? Mark --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Inhibit-duplicates-in-fold-packages.patch Content-Description: [PATCH] Inhibit duplicates in fold-packages >From 1d30931a28af4ed6aa747a05bc3540e335ce1b32 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 12 Feb 2013 20:29:30 -0500 Subject: [PATCH] Inhibit duplicates in fold-packages. * gnu/packages.scm (fold2): New procedure. (fold-packages): Rework to suppress duplicates. --- gnu/packages.scm | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/gnu/packages.scm b/gnu/packages.scm index 6a5496e..d783e4c 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm @@ -21,6 +21,7 @@ #:use-module (guix utils) #:use-module (ice-9 ftw) #:use-module (ice-9 vlist) + #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (srfi srfi-39) @@ -108,20 +109,33 @@ (false-if-exception (resolve-interface name)))) (package-files))) +(define (fold2 f seed1 seed2 lst) + (if (null? lst) + (values seed1 seed2) + (call-with-values + (lambda () (f (car lst) seed1 seed2)) + (lambda (seed1 seed2) + (fold2 f seed1 seed2 (cdr lst)))))) + (define (fold-packages proc init) "Call (PROC PACKAGE RESULT) for each available package, using INIT as the initial value of RESULT." - (fold (lambda (module result) - (fold (lambda (var result) - (if (package? var) - (proc var result) - result)) - result - (module-map (lambda (sym var) - (false-if-exception (variable-ref var))) - module))) - init - (package-modules))) + (identity ; discard second return value + (fold2 (lambda (module result seen) + (fold2 (lambda (var result seen) + (if (and (package? var) + (not (vhash-assq var seen))) + (values (proc var result) + (vhash-consq var #t seen)) + (values result seen))) + result + seen + (module-map (lambda (sym var) + (false-if-exception (variable-ref var))) + module))) + init + vlist-null + (package-modules)))) (define* (find-packages-by-name name #:optional version) "Return the list of packages with the given NAME. If VERSION is not #f, -- 1.7.10.4 --=-=-=--