From patchwork Sun Jun 2 20:19:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Vollmert X-Patchwork-Id: 14203 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E644217084; Sun, 2 Jun 2019 21:20:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 500B117048 for ; Sun, 2 Jun 2019 21:20:09 +0100 (BST) Received: from localhost ([127.0.0.1]:52565 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hXWxb-0002eN-5f for patchwork@mira.cbaines.net; Sun, 02 Jun 2019 16:20:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43284) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hXWxY-0002e5-Mv for guix-patches@gnu.org; Sun, 02 Jun 2019 16:20:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hXWxW-0008Q9-Pi for guix-patches@gnu.org; Sun, 02 Jun 2019 16:20:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55647) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hXWxW-0008Q5-Mi for guix-patches@gnu.org; Sun, 02 Jun 2019 16:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hXWxW-00066w-GS for guix-patches@gnu.org; Sun, 02 Jun 2019 16:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35935] [PATCH] guix: import: Simplify recursive import. References: <20190527200731.59990-1-rob@vllmrt.net> In-Reply-To: <20190527200731.59990-1-rob@vllmrt.net> Resent-From: Robert Vollmert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Jun 2019 20:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35935 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35935@debbugs.gnu.org Received: via spool by 35935-submit@debbugs.gnu.org id=B35935.155950680023478 (code B ref 35935); Sun, 02 Jun 2019 20:20:02 +0000 Received: (at 35935) by debbugs.gnu.org; 2 Jun 2019 20:20:00 +0000 Received: from localhost ([127.0.0.1]:40958 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hXWxT-00066c-Jr for submit@debbugs.gnu.org; Sun, 02 Jun 2019 16:19:59 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:9706) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hXWxQ-00066N-Fb for 35935@debbugs.gnu.org; Sun, 02 Jun 2019 16:19:57 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 465D84EC96; Sun, 2 Jun 2019 22:19:49 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id EuCXGjy9REJP; Sun, 2 Jun 2019 22:19:48 +0200 (CEST) From: Robert Vollmert Date: Sun, 2 Jun 2019 22:19:46 +0200 Message-Id: <20190602201946.84145-1-rob@vllmrt.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Robert Vollmert Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This simplifies the logic of recursive-import, intending no major functional changes. The package import function is no longer called twice per package. Failed imports now make it to the package stream as '() instead of #f. * guix/import/utils.scm (recursive-import): Simplify. --- guix/import/utils.scm | 86 ++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 54 deletions(-) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 516c0cfaa2..ff548b809a 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -378,57 +378,35 @@ separated by PRED." #:allow-other-keys) "Generate a stream of package expressions for PACKAGE-NAME and all its dependencies." - (receive (package . dependencies) - (repo->guix-package package-name repo) - (if (not package) - stream-null - - ;; Generate a lazy stream of package expressions for all unknown - ;; dependencies in the graph. - (let* ((make-state (lambda (queue done) - (cons queue done))) - (next (match-lambda - (((next . rest) . done) next))) - (imported (match-lambda - ((queue . done) done))) - (done? (match-lambda - ((queue . done) - (zero? (length queue))))) - (unknown? (lambda* (dependency #:optional (done '())) - (and (not (member dependency - done)) - (null? (find-packages-by-name - (guix-name dependency)))))) - (update (lambda (state new-queue) - (match state - (((head . tail) . done) - (make-state (lset-difference - equal? - (lset-union equal? new-queue tail) - done) - (cons head done))))))) - (stream-cons - package - (stream-unfold - ;; map: produce a stream element - (lambda (state) - (repo->guix-package (next state) repo)) - - ;; predicate - (negate done?) - - ;; generator: update the queue - (lambda (state) - (receive (package . dependencies) - (repo->guix-package (next state) repo) - (if package - (update state (filter (cut unknown? <> - (cons (next state) - (imported state))) - (car dependencies))) - ;; TODO: Try the other archives before giving up - (update state (imported state))))) - - ;; initial state - (make-state (filter unknown? (car dependencies)) - (list package-name)))))))) + (define (exists? dependency) + (not (null? (find-packages-by-name (guix-name dependency))))) + (define initial-state (list #f (list package-name) (list))) + (define (step state) + (match state + ((prev (next . rest) done) + (define (handle? dep) + (and + (not (equal? dep next)) + (not (member dep done)) + (not (exists? dep)))) + (receive (package . dependencies) (repo->guix-package next repo) + (list + (if package package '()) ;; default #f on failure would interrupt + (if package + (lset-union equal? rest (filter handle? (car dependencies))) + rest) + (cons next done)))) + ((prev '() done) + (list #f '() done)))) + + ;; Generate a lazy stream of package expressions for all unknown + ;; dependencies in the graph. + (stream-unfold + ;; map: produce a stream element + (match-lambda ((latest queue done) latest)) + ;; predicate + (match-lambda ((latest queue done) latest)) + ;; generator: update the queue + step + ;; initial state + (step initial-state)))