From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id WDJRH0OGuGA4VwAAgWs5BA (envelope-from ) for ; Thu, 03 Jun 2021 09:35:31 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id EHKQGkOGuGAGLgAAbx9fmQ (envelope-from ) for ; Thu, 03 Jun 2021 07:35:31 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1E93415085 for ; Thu, 3 Jun 2021 09:35:31 +0200 (CEST) Received: from localhost ([::1]:47212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loht4-0005CY-7L for larch@yhetil.org; Thu, 03 Jun 2021 03:35:30 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1622705731; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=j48txtXcEHysrIdG9JhX6uO5a+MQlhAX8Z1IBLnuasI=; b=VYzjgB/wdTklGJykUqklGTRU8FNjMNiV2g/cVxE8v1nBD5oF/7mfpJb1bI8PG4WM2GXr2z HoaVfPdK0mLEy6KdUUkRStivI4Mg8WTXgBg672ASYApxONC38kow3bcifuITVlWMXpPNAH CzZH7PydT6/k5FL7crxGE5i+XAVxxE9X6Bh6zai3pJc9cRNwkNmTnZxxsiy5PBSl11fQdQ Zs6MnXXQTrHu0goT35KNY+JgmQqHYFe5UtAckqmpVQ1qyjASvHAq0xFPQLMfUSt/CQlGAx eb0E7VMnr9K6PlpyuiKfRIxERFCQaoUg0+YgB4XtjXxb+eoz/Vkd/C1zzh6JWw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1622705731; a=rsa-sha256; cv=none; b=D+pD0H6VXZ1XzeBGG0e7n7En8URSwog9e/Yr70Qfm63aTUh3lpWtny+SffVpUwXqGab1Pu TzI1WC3eZ//yIGe6CBHTlSj1wg/0/V2DJVbQV8Uwum7o7jnD3D4EDtAwbsvUKp2MyXB912 8l3Ti+xyahH1uUaVNm/ug206xUAAz8sOI+6t9E8tYPv8PTA9mL/2vy1mQYA3Fo1i9g+7FU CL4FvMiSp1ZdDZ9teZFcMgChNYMNkyJuXv5Hr+kloOwiAoApoG1XyNahIkkbcBL8IjO9oP hCVO/SUHKqRewVXdI0PDy78VZcBtcoVeWu7d3BmzRg/XcPAHQ96YAN6kRnnjzA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 2.07 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 1E93415085 X-Spam-Score: 2.07 X-Migadu-Scanner: scn1.migadu.com X-TUID: lj5t7mIzyoRF * 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) -- 2.31.1