From patchwork Mon Feb 17 14:34:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Arnold X-Patchwork-Id: 38781 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 BF9BC27BBEA; Mon, 17 Feb 2025 14:36:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4583927BBE2 for ; Mon, 17 Feb 2025 14:36:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tk2EF-0007Uu-Tc; Mon, 17 Feb 2025 09:36:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tk2E8-0007Tz-KW for guix-patches@gnu.org; Mon, 17 Feb 2025 09:36:05 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tk2E7-00037i-As for guix-patches@gnu.org; Mon, 17 Feb 2025 09:36:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=+hjgx7vcNiJxBA/Rsm+ZmN9LjVl5su+aa5tilK0U0zg=; b=W2a80FlkPUYz5uc2T1ao5mj/+mVio+ZqG+8TfSRYqfm5qqpaweVtadLzNw4gYadJuBvXzrav18sXp8jmqJ7nU8z2alXZSh5cOoC9qd0e+ABJVTISTBmYXYHSFzXJR9hE/3CLDtMIHVkbX+xUCYrw1GqfIm7wzKLrFjdYEi7Z8pspSSAb1DKhB5KMaJ+vgqJ+bAZ5M7nsOInjmd4gYwaw388h0uwLqfn3gOVGS3uaTjNF94BfBC5cGsIGxUazQEe1OgCv2gwGEzruwUS/PLfago31B6Clff7PXtUBrw7WoiFkgJhM9Tu0eaedthbm9u4GpJnd9wIskS2kySSjVTMdhA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tk2E7-0001ar-3H for guix-patches@gnu.org; Mon, 17 Feb 2025 09:36:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#55231] [PATCH v7 2/4] derivations: Fix indentation. Resent-From: Morgan Arnold Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Feb 2025 14:36:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55231 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55231@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 55231-submit@debbugs.gnu.org id=B55231.17398029195947 (code B ref 55231); Mon, 17 Feb 2025 14:36:03 +0000 Received: (at 55231) by debbugs.gnu.org; 17 Feb 2025 14:35:19 +0000 Received: from localhost ([127.0.0.1]:45007 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tk2DP-0001Xp-0X for submit@debbugs.gnu.org; Mon, 17 Feb 2025 09:35:19 -0500 Received: from mail-10629.protonmail.ch ([79.135.106.29]:34901) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tk2DI-0001Rk-83 for 55231@debbugs.gnu.org; Mon, 17 Feb 2025 09:35:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1739802903; x=1740062103; bh=+hjgx7vcNiJxBA/Rsm+ZmN9LjVl5su+aa5tilK0U0zg=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector:List-Unsubscribe:List-Unsubscribe-Post; b=ObMIZS6Y4QRrjlUR9EU4IsflFc5YUYYD1mXSmOgqYqfHSo9HqfbPxhzrjpxAy5GPV igaUElbw8N4/oVDRo3thAzloZJQ+bnxfZBQv4S0BmSP1348tT6aQ9FKUL3XJ2sknNQ TfIFsEq41NmD0pWlca1YD5506XmeOYAyQ1xzWxxyUDXaOnaMXoyiPqFlZK+lreC8no 0g6Xk0ZN3gwrlrCDd5GEl5lLu34iOoZrDoU0U4wMLNUXPkS2/+R2armtBetHw1iT0S n3dKYfFj+GCZeU8gyADIt2h4PSU1T5UHCsyaG3rP1+fJQgq6TDqMOTIPPdn/zlH2TF lw9FeeR1lj9Bw== Date: Mon, 17 Feb 2025 14:34:59 +0000 Message-ID: <9e47b0e6cfb99f4d5cd4a3e4c4e1d6ac13973f4f.1739802789.git.morgan.arnold@proton.me> In-Reply-To: References: Feedback-ID: 45510636:user:proton X-Pm-Message-ID: b326bd8819a2ac4109fba1ba6ce81010c8110516 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: , Reply-to: Morgan Arnold X-ACL-Warn: , Morgan Arnold via Guix-patches X-Patchwork-Original-From: Morgan Arnold via Guix-patches via From: Morgan Arnold Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Maxim Cournoyer * guix/derivations.scm (derivation): Fix indentation. Change-Id: I2407b59788ce335c21c181d9f9e3f26a359e9bf5 --- guix/derivations.scm | 46 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/guix/derivations.scm b/guix/derivations.scm index bef98cd..ffa69e9 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -841,30 +841,30 @@ (define* (derivation store name builder args ;; corresponding environment variable. (match drv (($ outputs inputs sources - system builder args env-vars) + system builder args env-vars) (let* ((drv-hash (derivation-hash drv)) (outputs (map (match-lambda - ((output-name . ($ - _ algo hash rec?)) - (let ((path - (if hash - (fixed-output-path name hash - #:hash-algo algo - #:output output-name - #:recursive? rec?) - (output-path output-name - drv-hash name)))) - (cons output-name - (make-derivation-output path algo - hash rec?))))) + ((output-name . ($ + _ algo hash rec?)) + (let ((path + (if hash + (fixed-output-path name hash + #:hash-algo algo + #:output output-name + #:recursive? rec?) + (output-path output-name + drv-hash name)))) + (cons output-name + (make-derivation-output path algo + hash rec?))))) outputs))) (make-derivation outputs inputs sources system builder args (map (match-lambda - ((name . value) - (cons name - (or (and=> (assoc-ref outputs name) - derivation-output-path) - value)))) + ((name . value) + (cons name + (or (and=> (assoc-ref outputs name) + derivation-output-path) + value)))) env-vars) #f))))) @@ -910,10 +910,10 @@ (define* (derivation store name builder args ;; Return a variant of ENV-VARS where each OUTPUTS is associated with an ;; empty string, even outputs that do not appear in ENV-VARS. (let ((e (map (match-lambda - ((name . val) - (if (member name outputs) - (cons name "") - (cons name val)))) + ((name . val) + (if (member name outputs) + (cons name "") + (cons name val)))) env-vars))) (fold (lambda (output-name env-vars) (if (assoc output-name env-vars)