From patchwork Thu Jun 3 07:33:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 29823 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 BDB0F27BC81; Thu, 3 Jun 2021 08:35:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 87C2D27BC78 for ; Thu, 3 Jun 2021 08:35:30 +0100 (BST) Received: from localhost ([::1]:47212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loht3-0005CY-Lx for patchwork@mira.cbaines.net; Thu, 03 Jun 2021 03:35:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lohse-0004fS-2y for guix-patches@gnu.org; Thu, 03 Jun 2021 03:35:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58712) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lohsd-0001vT-RE for guix-patches@gnu.org; Thu, 03 Jun 2021 03:35:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lohsd-0001Wr-P9 for guix-patches@gnu.org; Thu, 03 Jun 2021 03:35:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48806] [PATCH 4/7] grafts: Use SRFI-71 instead of SRFI-11. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Jun 2021 07:35:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48806 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48806@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 48806-submit@debbugs.gnu.org id=B48806.16227056865792 (code B ref 48806); Thu, 03 Jun 2021 07:35:03 +0000 Received: (at 48806) by debbugs.gnu.org; 3 Jun 2021 07:34:46 +0000 Received: from localhost ([127.0.0.1]:42014 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lohsL-0001VC-KZ for submit@debbugs.gnu.org; Thu, 03 Jun 2021 03:34:45 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36924) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lohsK-0001US-NQ for 48806@debbugs.gnu.org; Thu, 03 Jun 2021 03:34:44 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:60214) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lohsF-0001Xl-H9; Thu, 03 Jun 2021 03:34:39 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=57488 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lohsF-0005sA-1c; Thu, 03 Jun 2021 03:34:39 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Thu, 3 Jun 2021 09:33:58 +0200 Message-Id: <20210603073401.13629-4-ludo@gnu.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210603073401.13629-1-ludo@gnu.org> References: <20210603073401.13629-1-ludo@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/grafts.scm (reference-origins): Use SRFI-71 'let*'. --- guix/grafts.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/guix/grafts.scm b/guix/grafts.scm index dff3d75b8b..e5672268b1 100644 --- a/guix/grafts.scm +++ b/guix/grafts.scm @@ -25,10 +25,10 @@ #:use-module ((guix utils) #:select (%current-system)) #:use-module (guix sets) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-11) #:use-module (srfi srfi-9 gnu) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) + #:use-module (srfi srfi-71) #:use-module (ice-9 match) #:use-module (ice-9 vlist) #:export (graft? @@ -223,10 +223,10 @@ have no corresponding element in the resulting list." ((set-contains? visited drv) (loop rest items result visited)) (else - (let*-values (((inputs) - (map derivation-input-derivation - (derivation-inputs drv))) - ((result items) + (let* ((inputs + (map derivation-input-derivation + (derivation-inputs drv))) + (result items (fold2 lookup-derivers result items inputs))) (loop (append rest inputs)