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 oN30Ht1OWGfgjwAAqHPOHw:P1 (envelope-from ) for ; Tue, 10 Dec 2024 14:23:25 +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 oN30Ht1OWGfgjwAAqHPOHw (envelope-from ) for ; Tue, 10 Dec 2024 15:23:25 +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=CS0l60N9; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=YvUnuXjR; 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=1733840605; a=rsa-sha256; cv=none; b=PlhcXZHYlKIb+XVFgbiZsZJtX4TsH6Qz/AIkc/U+h1J0BGWhxrfHCt3c+ROaS9tfBDJYVR 9pxDIkSvYsLkeEzfkkpswZXDam50neOQguIRnq775l9M7fbntuMhjhtB50gVxaqR0v4oy/ TNWudMbK9j7vuH0wSRGkuYZvtC8k/tSTrHqNqFm/rwgl3bTiljwK6qesqZHC7S8DuHfPcZ TgIhMT2HfFWBeKL4HIDKpvnG65vmjwOCqK1JbQ5TEba2nhjefheG4OshIWCSnM3g4MYz4D wh2H5DfEuNTKUWDlPiZXGw4eYA8km+qbaYevcbDOUuWSc1XEIRKsTN5uDWw8hg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=CS0l60N9; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=YvUnuXjR; 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=1733840605; 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=FscAKyJRe+MW0UC4yAwNOMnn15FlzrnbKLhGyaoVe04=; b=UgX9B5i9PPv8FlE7vf2/FO+9ZWgdXb6fHVGNwYEyChjsLMZVj7TMlNzh1zmVZQbqSqdx/6 KxLtm0aVRJev5DciopJYMxWl3J3J5d8zllDphvL6EPwz3II7jmQyEW4c0qclxaJARFihBB fswSYSp1HuA6Vk42UrrxksIdMNwBLWa6avEV6YFTZWVRVq5S+Bhoc8nSizOlE9Sg2NPIwd 2naB4IZKtbi41dHlL/haDhn6SMjVVqodbOeiU1jEmyilXs0jrtc+2sPJA3YUwfjQwmdEaG K1+kQCIec6mxpxYNosmaSAwRJgEL96Pdbk2PIac17ykEt+IoeyF7o5FsJhzxew== 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 3C2C059D5 for ; Tue, 10 Dec 2024 15:23:25 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tL18o-0003mD-PN; Tue, 10 Dec 2024 09:23:11 -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 1tL18i-0003l5-FQ for guix-patches@gnu.org; Tue, 10 Dec 2024 09:23: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 1tL18i-0001Om-6N for guix-patches@gnu.org; Tue, 10 Dec 2024 09:23: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:Date:From:To:Subject; bh=FscAKyJRe+MW0UC4yAwNOMnn15FlzrnbKLhGyaoVe04=; b=CS0l60N9vH+yV82AZ65cT9laj/qp33qa5AW00bGipUbr9Y0elBjgBfQsCjUMA1WaSu3oZ+Glnqlow8xJT+3buFUPBOdsiTAkv3DkW58wy1B58rB1802BPimRgx4TswVk7NCgrPmurDOZ8VzGGnHdtktq+jRz6qRkaIHPGyMaMaFI6QsnikL6h9SIlZBYU4rEfbmq6+RrC0ku8KWn4yfT9GufXpBPrigGtPHUQ6uCz8qq8beTStvyEbkvFz5vo8IETPhgeJwLFDWZMkkPAoJlUqbE8o++lvl//H3/UkObDip/1scOBpeUyAyNtcOQP5soNFpFXTxNVgAuHDdFiue2VA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tL18h-0001aF-Vz; Tue, 10 Dec 2024 09:23:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74767] [PATCH rust-team 01/23] 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: Tue, 10 Dec 2024 14:23: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.17338405755971 (code B ref 74767); Tue, 10 Dec 2024 14:23:03 +0000 Received: (at 74767) by debbugs.gnu.org; 10 Dec 2024 14:22:55 +0000 Received: from localhost ([127.0.0.1]:57489 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tL18Y-0001Y9-FK for submit@debbugs.gnu.org; Tue, 10 Dec 2024 09:22:54 -0500 Received: from mail-pj1-f51.google.com ([209.85.216.51]:56447) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tL18U-0001X9-WF for 74767@debbugs.gnu.org; Tue, 10 Dec 2024 09:22:51 -0500 Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2ef89dbd8eeso2078231a91.0 for <74767@debbugs.gnu.org>; Tue, 10 Dec 2024 06:22:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733840505; x=1734445305; 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=FscAKyJRe+MW0UC4yAwNOMnn15FlzrnbKLhGyaoVe04=; b=YvUnuXjRM0IJFSKGA/JbUlx90iFOxDMZIqE9jAdTMem9lzdT9Sy/tlZKef7UethDWS 89b5BguYiBkIqjrLi6HFWRKVcE4heKzr5WbvqFcB07fgogdpBaGD923kva58VHih+H0H pz5OVKqJfr8xGYNVQyEoknAZ5Mlb1+8VJbbxElXy89wXzmTgqwpf26Gs6N4Dmt3WWwpv cIFYFNFtSwOdcV15LOnn6uB88i43nYuir5EwzoBRGbfj419Y+8vlk+73zpUH3tdBhUYi kz3iDpR1rWWbGMIH2QFROENGkUesstfjJ6hZz9PttUVnxVRtHzQH19KyDPu6P9lIUz4K UdPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733840505; x=1734445305; 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=FscAKyJRe+MW0UC4yAwNOMnn15FlzrnbKLhGyaoVe04=; b=trwFOjHJoemvgh2EKizfURVDLeoT839MmnZbeazscIpaqO+N4EUFNdRkNIG5yLf+P4 S9pflN5AOYuYnyLur9dA5dLKCSDF13FDkTQ3ikW5358+hlUfhPqIEeliQiCwR7aPfwGy 50qXbsIuzu9mj9BOsUjdJrGu1ai7BSruh4EC9wlJS/STZXXzuBbFSs2X5Xs17d2OOQt5 F+EXMKr9g0yrA1NAP+GyoSIMQGxRHCb5AeC/bVwYm6JZrj1B/DdtnoN5Kg3p0f0PAVEr 27vPFqxtC1ZUDUJGmetx4H9/nW3bHtIvf0XXvqCeKFMkr8CvNkZdIwXlKh/oDMVLzLy0 F/cg== X-Gm-Message-State: AOJu0YyoGJIhuBSJIvB5JaMeaVDcgZa9kwq+KuwK8ngGa71+kbJ3I7gh nrnVR4XpQ7GoefWbTkgk/Pt7qwtzCFkma/PK4pugcRXRE1LaLch4f/bCyA== X-Gm-Gg: ASbGncvIoy8C1KY1DHbMT8EW6/xhgH8ejqGKbAFrwBNc6NSroKxXd4R+ZjrqGe8jip5 75zMtAf8VhnNguzOVKSBYif7ARMSfBVPCTsq0l7k6/c/DaTKH7KLaBoMb0iAcQOCt8KieVa7Uu0 4wiPwJVOkuNlrJwVjogB+z1u/xnRaUESEaP6aA4zDavMdYlFXgjRzUI+w6JsuqR6ZNlRTPomPhp gm+xDfxZt5xrBN4yLvF6L65r3IrEQlOK98jA4ztBApkrihLZnwfGUMIfmlNZE2dWjIa79cI X-Google-Smtp-Source: AGHT+IEEuN4sOYimgBmBLhjAuscw0p5YhqQAbXZG0fPHk9qw7uJA6dFT1DtBF1BDwu3cxm9tyghBKQ== X-Received: by 2002:a17:90b:3d46:b0:2ee:b2be:f390 with SMTP id 98e67ed59e1d1-2ef6aad0b80mr21809385a91.28.1733840504555; Tue, 10 Dec 2024 06:21:44 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ef45fa64e0sm9767669a91.26.2024.12.10.06.21.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Dec 2024 06:21:44 -0800 (PST) From: Maxim Cournoyer Date: Tue, 10 Dec 2024 23:21:04 +0900 Message-ID: <5b23f5cb76b23feed1002f62e7f20eecc1aeda7c.1733840023.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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: 3C2C059D5 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -9.18 X-Spam-Score: -9.18 X-TUID: T3SfUqloIuMr * guix/build/cargo-build-system.scm (unpack-rust-crates): Delete trailing #t. (configure, patch-cargo-checksums, package, install): Likewise. Change-Id: I510a46b3d35cd292d71d5646d4a0436f7d77f98e --- 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