From patchwork Sun Feb 16 12:52:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 38737 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 1A3F527BBEA; Sun, 16 Feb 2025 12:54:46 +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.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS autolearn=unavailable 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 9CA2F27BBE9 for ; Sun, 16 Feb 2025 12:54:45 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tjeA7-0006LG-04; Sun, 16 Feb 2025 07:54:19 -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 1tjeA5-0006Ka-7J for guix-patches@gnu.org; Sun, 16 Feb 2025 07:54:17 -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 1tjeA4-0007fe-M1; Sun, 16 Feb 2025 07:54:16 -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:Date:From:To:Subject; bh=vCWWkNucH/lViQB+qrOb6fJTg0rUx0PTq+0DfEz3jR8=; b=Hp99i3u584f/UAXxfIWpOQOid1wDMKVLKlExbbMwOjBfVJ/lTL2oXlyP2hzKde+Mil4wT6NuBM0+s/GdTEoHdPxaQY3bRaXDgrgy/BhuZeqpESBHb11xUNEy1zVK9Qh5w7wcCYzEkB8JZTmNjrjALTTB0d6irz7FdhzyTO9tXvjnRH+Gnn4MCiMlLkpl1DtMnq5lzF9f1xJzk+m6x/Fyaosd+wuwACXR+0YvhPqdGGAVitZ/dnctypHdjb8m+gXj3QUjd111VrEC655tVWthaBJ3/7Yzoca5ztqnzyvA9fJWWJzfNaiX1ViRD1K4Uk1JPSSLAjOw8MaNecyLANEAQg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tje9q-0007Gb-BH; Sun, 16 Feb 2025 07:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#55231] [PATCH v6 2/4] derivations: Fix indentation. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bjc@spork.org, maximedevos@telenet.be, kaelyn.alexi@protonmail.com, ludo@gnu.org, morgan.arnold@proton.me, ian@retrospec.tv, john.kehayias@protonmail.com, leo@famulari.name, felix.lechner@lease-up.com, andreas@enge.fr, bjc@spork.org, maxim.cournoyer@gmail.com, guix@cbaines.net, dev@jpoiret.xyz, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sun, 16 Feb 2025 12:54:02 +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 , Brian Cully , Maxime Devos , Kaelyn , Ludovic =?utf-8?q?Court=C3=A8s?= , Morgan Arnold , Ian Eure , John Kehayias , Leo Famulari , Felix Lechner , Andreas Enge , bjc@spork.org, Maxim Cournoyer , Christopher Baines , Josselin Poiret , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Brian Cully , Maxime Devos , Kaelyn , Ludovic =?utf-8?q?Court=C3=A8s?= , Morgan Arnold , Ian Eure , John Kehayias , Leo Famulari , Felix Lechner , Andreas Enge , bjc@spork.org, Maxim Cournoyer , Christopher Baines , Josselin Poiret , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 55231-submit@debbugs.gnu.org id=B55231.173971041827860 (code B ref 55231); Sun, 16 Feb 2025 12:54:02 +0000 Received: (at 55231) by debbugs.gnu.org; 16 Feb 2025 12:53:38 +0000 Received: from localhost ([127.0.0.1]:60812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tje9S-0007FI-9m for submit@debbugs.gnu.org; Sun, 16 Feb 2025 07:53:38 -0500 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]:58391) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tje9P-0007Ex-Rg for 55231@debbugs.gnu.org; Sun, 16 Feb 2025 07:53:36 -0500 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-220c8eb195aso72865235ad.0 for <55231@debbugs.gnu.org>; Sun, 16 Feb 2025 04:53:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739710408; x=1740315208; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vCWWkNucH/lViQB+qrOb6fJTg0rUx0PTq+0DfEz3jR8=; b=MpV2blfDPdbGY4dWfHYSP+fo79cs7M/1SSuHTMhcricKBgYrKewEUR34b5F9t240aW d0sCfLvpJE8gyrzJYujWf30UT+WGiODFjQmGNXn7KDxEXu6asG3BJ1s38mmljW6e6o+P CfkojzFqy4UnKgvolpDhBD4tTpDZTLTP98D8PsvFjoUAbjtYnn7ZnARyAmbcqNwHU/bU skKm3nY6/s7WyAOzcuGDavFSqNfcEieSzoyRip6nO6qkERvLcIQxaw+FTveNjUBQOW1Q RbXLG5uLL+X4hJKaOu/pQFjQmr7gSIFJCG/VHx7Y6NKkmo6mPNF2ndfijJXsYoPbZVAN lvNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739710408; x=1740315208; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vCWWkNucH/lViQB+qrOb6fJTg0rUx0PTq+0DfEz3jR8=; b=szJjanDNOTTtOFPlap984PHMIYxLbmKnCmeSMfGTm0DWB3mEwf22ORNrxEqYvDww4s rD1ZvpoSDCvTG75Ia/jPfWcwPyYxCk4WqsnMMuTLV2u6LkBHVE21mnqZ4siCux0GbpLt wLQvIfMIwvhlmp9NeebhWrSOKon1ZFAOiyy/rl/1KHYVn0cgecfFYN7I7vr07vEMCqN9 k5wiAqYEjgJGRO9aWOh5luegFw3Q2y3WheyVP3YdVlV0z6yGpCo9ac0gQjIiWNpC/Aut GHIKOJeCEVPyAXGDl5YMN9C9IpBdC7q1nhI9wvnDX/4BeWIDADFIX4YQc9DxUxC5BPmy 1RlA== X-Gm-Message-State: AOJu0Yw7CoCheZ29xQK+lJgm5jqgPS9lGy+hmNN4rRIYmvBqTkQlsJRW afO1/vPZrh8bSo2UbQsKA8DwzvXBmcR173m/R0jRkdfcsuJd0xjveqPKEq1v X-Gm-Gg: ASbGnct/uuC9v6M20Mjsdo2ArIkJFQW2B5LJdCBAOBdRYUZUzbaP5pCPj332GvleiTr QdS0wBxbRleF677H527aEr4hr4DAXidF1TbTKCAE9F3Ys/QVUms4u7vrWjGOzXLJq2nVA2FuUdV NLaJJc0tApb4P7JvGl0JJQzcInOqpXd7heeX2FSZd9ZQGZchNoAwcnEtK4xpcQ/+4YjpBLJomI6 XpLeb3EsadQWyBn1quGpzWN5II0rdmV1Xi0UgEGGdr9VjzaTr2sK0DvhXk00Ncwy+CD+q3FV6nV QbFcUEUD3aZnerNIvnJTru6EcxCIKqNclw== X-Google-Smtp-Source: AGHT+IHDmnuSKOSchS/PBRIezkLv1QGBmlU9+4uX50grfU4f5tUblbKJVEtw1JAPa4FuqEZLMe6O8w== X-Received: by 2002:a17:903:1d1:b0:220:d272:534d with SMTP id d9443c01a7336-2210405c6b6mr114538045ad.22.1739710408364; Sun, 16 Feb 2025 04:53:28 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d82e843fsm54178725ad.220.2025.02.16.04.53.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Feb 2025 04:53:27 -0800 (PST) From: Maxim Cournoyer Date: Sun, 16 Feb 2025 21:52:46 +0900 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: <353146a4da0938e592fa4333b601abf5b98d937d.1739710358.git.maxim.cournoyer@gmail.com> References: <353146a4da0938e592fa4333b601abf5b98d937d.1739710358.git.maxim.cournoyer@gmail.com> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 bef98cd26a..ffa69e924c 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)