From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id CM5sMJPwWGdxCgAAqHPOHw:P1 (envelope-from ) for ; Wed, 11 Dec 2024 01:53:23 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id CM5sMJPwWGdxCgAAqHPOHw (envelope-from ) for ; Wed, 11 Dec 2024 02:53:23 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=mubk0qn+; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="TfZiNB/u"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1733882003; a=rsa-sha256; cv=none; b=Zmy8ZZ8WaQxvqfMM9rxLTEGSUIfLly7uV4l9xz/Fenpgy8l5QGWjp13H5ejaWTq/A2gXXT g/A30BEzEGH7lJjp7dl4SZ2aQnxopkqZgXQNxyWIoryoB77ByxMqS2pVemQ6eCZMHTj8GZ SJINjoYxK+IX5Lt0ZKFfy+UKApCTJ4GV7Yj0yEW73u3R25hfgyMRWNyWv6nYhdZeAtFQ/s tE6UvW4AfURq6duAfEuBK/uLFrgK9/LBTsBUMOuWKV0v+3VLR0TH9lFqhGpJHemMb3HaUk MXt6Ll+JsqD1af4TFmeDzbXFz3xsgY2rGW2afDCHe0c6LmduUgVFntl5Bkom6w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=mubk0qn+; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="TfZiNB/u"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1733882003; 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:dkim-signature; bh=UI6c8XLDoOQ1xSa85Wtb2ghspwMcaBbQjvJYCTCK7n8=; b=om30kfap5iY43zkLJNw7lGFASNWBuGMZXvKswEYoN88Ls76ZdBMChmrENpL7oKU7nycJL5 u0CNwVpjwIhsdUB7cRtSaaGXg5dHZT0MQMoeQVYAqIRdOam94kC1j1u8rU5BUMRGbdlWHv 12Uq6mGOdNM73nWWx2W/0oMj6DSHi8BBTw05Z9k9qZR6A2tGSqU4BQ6E0c5kTOSftw2mW7 EtVK4CEwOM+7oiuJCVaJpNdNZX6L0Km8PXXmaMVIH89srYXX8DNdWpCwKRME9M+nHiue32 phQ+b0F28ARJSq3m2T+cnB1OysTm3cdHvo3RpT7+MNplEGfSRGXphdXi7Hr7cw== 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 26F3F3551 for ; Wed, 11 Dec 2024 02:53:23 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tLBuX-0002pC-0K; Tue, 10 Dec 2024 20:53:09 -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 1tLBuU-0002ns-NH for guix-patches@gnu.org; Tue, 10 Dec 2024 20:53:06 -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 1tLBuR-0007tU-Hs for guix-patches@gnu.org; Tue, 10 Dec 2024 20:53:06 -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=UI6c8XLDoOQ1xSa85Wtb2ghspwMcaBbQjvJYCTCK7n8=; b=mubk0qn+D/16Zi2saQd8b68kkv88YX6iEUx1lopObuxxraRVHIsKDLYzIHLEDEe1Qsa0qf+TF4yedn5TELgNVQOCxIYcVHhPvtXHSWh9Xz3kNiMoLc2DwyWGv1UGheX2/SHNS06peWxDxTo0Ffa3HeiPO/cW/NrghltZutMMye96He/EgSfWS9Hm695eleSYyJYfEwdH8KOWSAz7L2Aiu5HNapgdO2dRoV+ZyAw2z5vhde32XEIREwIAI8fBZpO9GCn1qzI28b2eQow2edNTdO+qmIF47uKqRuUeXIluZKHMqjyVYu1MYLwwuZjUF3Pa/3/HASGRuxM8ffMIC+VOqg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tLBuR-0007Er-Bz; Tue, 10 Dec 2024 20:53:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74767] [PATCH PATCH rust-team v2 02/24] build/cargo: Delete trailing #t in phases. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Wed, 11 Dec 2024 01:53:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74767 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74767@debbugs.gnu.org Cc: Maxim Cournoyer , Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 74767-submit@debbugs.gnu.org id=B74767.173388193127411 (code B ref 74767); Wed, 11 Dec 2024 01:53:03 +0000 Received: (at 74767) by debbugs.gnu.org; 11 Dec 2024 01:52:11 +0000 Received: from localhost ([127.0.0.1]:60401 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tLBta-000781-EW for submit@debbugs.gnu.org; Tue, 10 Dec 2024 20:52:10 -0500 Received: from mail-pl1-f169.google.com ([209.85.214.169]:60702) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tLBtV-00076V-7i for 74767@debbugs.gnu.org; Tue, 10 Dec 2024 20:52:05 -0500 Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-21654fdd5daso25318725ad.1 for <74767@debbugs.gnu.org>; Tue, 10 Dec 2024 17:52:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733881859; x=1734486659; 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=UI6c8XLDoOQ1xSa85Wtb2ghspwMcaBbQjvJYCTCK7n8=; b=TfZiNB/uPLNGllolV33FUwy310QXm5Axxbcb8M9lAp6m4nLbFPqs8g9Is+3TVRXFs3 FU3++gtWJBmcdeKoiqQFMHMetpakf2ZxlpYO4PbKLnXMAPQKG0EEgs2Jr3TyXCTbnF8y ODyV3it7v6vWmJVXY3la6bTwrWpGplInDdZudsEhatVtcvhoRF8lETqt/lFi+2Ztdbqi 3sWw3+u468r9U0GPH6ZN2BxqmGgfgH+JldoCA1Hk4Z2MNP3dcdTWPJSGBeDFCLGwXti6 VOIfWFD3RpWDdAncZAAS3wZL4yvK9ZMtdeg727UcWnyFhKbyVf9gEo4YEtTj3t3pUNRJ 8B3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733881859; x=1734486659; 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=UI6c8XLDoOQ1xSa85Wtb2ghspwMcaBbQjvJYCTCK7n8=; b=ORi6gt+qcP3XjUYftiuCIeGQ7ps6vPya4yOuvYNt+FKcWqEnHbiEMqwSarP7Zm5rRA rUj+Uq7e3B5IhT43PpBoST1u0YL7Q8FPKgjMLGRUPRUCmCyaNckmmBxBoTKevhYW4XwK Y5yJAzKhoM3UnqgXSqcglp2Z6tBnz57v7EPYBwmae7Tncxo99tDrAs/MStlV2lIuB/FF cMvatWgJzlSob2hJ2D/dh/jSRD1w8WVimKhpymgYm8AWhBHPxQM9K1L8ZPb5KFuWuMzd 2Q+HsSud7XlnT2RodY+VzwMmnCEjc1at95iNWTHTxch8ss9kLYxPDdAo10UUj6wonuXY RqMA== X-Gm-Message-State: AOJu0YyTscu1/37/saOFB1Gi+pw4S236QOKdm6t4ye8vLp1aO/esVapz 77hz7jxYfvMCqCL1dWg/kQsMm2vj/G5ITpHJNALZOsqG4XEmQfvpOQqDwQ== X-Gm-Gg: ASbGncsTd+ykbh6iir6bqFmRBMO99TLc96nVEYxDnHnAn9DzZh3yE6wOEDDS2Hcn9UI wuH+bIsKTkfPM29vPPxSce+yJHbv9DKReXQda6Ypd2BtSsRbFfeYgAOk6Zd0Hb9/XsN2tCYnukZ P0Mmct94SXC535W5JFclGmORyVE9JF7EziJALyRmmKcp7WY633XZ0DrFx3NOpIuAFVZDjp2DZiA JioKzltHnw2ZZ5uFZAta/+tgvsT8mXOyAwXUiESChMsJZ6t3Xgv53n34E/NoGfRcopj6pZq X-Google-Smtp-Source: AGHT+IEnsasTkJa2IyyhWq5NSUrQ2WLo7EDGLczXsWNHQ87uV4FN8jXHcqM3DPVoxioqoJCJhtzRUg== X-Received: by 2002:a17:902:cece:b0:216:18dc:43b3 with SMTP id d9443c01a7336-21778508cd8mr18553755ad.42.1733881858568; Tue, 10 Dec 2024 17:50:58 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21631118cedsm61537435ad.150.2024.12.10.17.50.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Dec 2024 17:50:58 -0800 (PST) From: Maxim Cournoyer Date: Wed, 11 Dec 2024 10:48:49 +0900 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: <3751e2473a8415293f3903c0aaa34362bc0b6f30.1733881750.git.maxim.cournoyer@gmail.com> References: <3751e2473a8415293f3903c0aaa34362bc0b6f30.1733881750.git.maxim.cournoyer@gmail.com> 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 26F3F3551 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -4.99 X-Spam-Score: -4.99 X-TUID: VJ4O3C4YnL0c * guix/build/cargo-build-system.scm (unpack-rust-crates): Delete trailing #t. (configure, patch-cargo-checksums, package, install): Likewise. Change-Id: I510a46b3d35cd292d71d5646d4a0436f7d77f98e --- (no changes since v1) guix/build/cargo-build-system.scm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm index 132a811f49..84897393d9 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -105,8 +105,7 @@ (define* (unpack-rust-crates #:key inputs vendor-dir #:allow-other-keys) (for-each (lambda (crate) (invoke "tar" "xzf" crate "-C" vendor-dir)) - (find-files "target/package" "\\.crate$")))) - #t) + (find-files "target/package" "\\.crate$"))))) (define (rust-package? name) (string-prefix? "rust-" name)) @@ -220,8 +219,7 @@ (define* (configure #:key inputs ;; during building, and in any case if one is not present it is created ;; during the 'build phase by cargo. (when (file-exists? "Cargo.lock") - (delete-file "Cargo.lock")) - #t) + (delete-file "Cargo.lock"))) ;; After the 'patch-generated-file-shebangs phase any vendored crates who have ;; their shebangs patched will have a mismatch on their checksum. @@ -229,10 +227,10 @@ (define* (patch-cargo-checksums #:key (vendor-dir "guix-vendor") #:allow-other-keys) "Patch the checksums of the vendored crates after patching their shebangs." - (generate-all-checksums vendor-dir) - #t) + (generate-all-checksums vendor-dir)) (define* (build #:key + parallel-build? skip-build? (features '()) (cargo-build-flags '("--release")) @@ -311,8 +309,7 @@ (define* (package #:key (find-files dir #:directories? #t)) (delete-file-recursively dir))) (find-files "." "\\.crate$"))))) - (format #t "Not installing cargo sources, skipping `cargo package`.~%")) - #t) + (format #t "Not installing cargo sources, skipping `cargo package`.~%"))) (define* (install #:key inputs @@ -348,9 +345,7 @@ (define* (install #:key (for-each (lambda (crate) (invoke "tar" "xzf" crate "-C" sources)) - (find-files registry "\\.crate$"))) - - #t)) + (find-files registry "\\.crate$"))))) (define %standard-phases (modify-phases gnu:%standard-phases -- 2.46.0