From unknown Tue Jun 17 20:20:17 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#75321 <75321@debbugs.gnu.org> To: bug#75321 <75321@debbugs.gnu.org> Subject: Status: [PATCH rust-team] build: cargo-build-system: Use Cargo checksum stubs. Reply-To: bug#75321 <75321@debbugs.gnu.org> Date: Wed, 18 Jun 2025 03:20:17 +0000 retitle 75321 [PATCH rust-team] build: cargo-build-system: Use Cargo checks= um stubs. reassign 75321 guix-patches submitter 75321 Herman Rimm severity 75321 normal tag 75321 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 03 11:08:44 2025 Received: (at submit) by debbugs.gnu.org; 3 Jan 2025 16:08:44 +0000 Received: from localhost ([127.0.0.1]:51804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tTkE8-0008Bj-B3 for submit@debbugs.gnu.org; Fri, 03 Jan 2025 11:08:44 -0500 Received: from lists.gnu.org ([2001:470:142::17]:50536) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tTkE5-0008BR-Ry for submit@debbugs.gnu.org; Fri, 03 Jan 2025 11:08:43 -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 1tTkDt-00047O-7h for guix-patches@gnu.org; Fri, 03 Jan 2025 11:08:30 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117] helo=email.rimm.ee) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1tTkDq-0006oL-Lf for guix-patches@gnu.org; Fri, 03 Jan 2025 11:08:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1735920487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kie89hWwwvbmhj07VGgyHcrsXEyoeOn54TKjHMOrIic=; b=eBWmL+aAhTrOJyhArr4ypqyLda5C/K4SeZnF8sO80AMjbhJbtLAvzNLsHpUupubwPPfe0B neGghh4fkHE7iEnI0jELoNfhTVuTTBLPdYjxxvQHEU8hzlE21nrOUf5PYuN3KCuokht0WO DEIceN6K8b3b+PZlIdMTGGGb27lPVZ1u2RYpn5gfERi+hP8iYXIVVGV9CcX0uCK5JDLQIS ZM96U0VTx0RvrC97v55+jhkx0K05L2m3etgfT8R1W8A2w7wcdJagYOgUJqH7nBb7fxSNnN T4Fz+jAoZLukDqEtHb8VAIZWC2fbvYr482oXuU2Ht5+qVpvjtpLi70458OPR3A== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 7588b8b2 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Fri, 3 Jan 2025 16:08:07 +0000 (UTC) From: Herman Rimm To: guix-patches@gnu.org Subject: [PATCH rust-team] build: cargo-build-system: Use Cargo checksum stubs. Date: Fri, 3 Jan 2025 17:07:23 +0100 Message-ID: <20e1578fa994018d6c63f01312f3d99852e656e2.1735920229.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@rimm.ee; helo=email.rimm.ee X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_RCVD_IP=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) Commit 5b08b8fe1019147fe489db17a9a8ae7ebe97f9e9 of Cargo makes the package field optional. This is the case since Rust 1.22.0. * guix/build/cargo-build-system.scm (patch-cargo-checksums): Create .cargo-checksum.json stubs. Change-Id: I474e8f73b6048e53f22a8d899a8e3e50b5332f60 --- guix/build/cargo-build-system.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm index 480134402f2..bbb79a7331b 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2024 Maxim Cournoyer +;;; Copyright © 2025 Herman Rimm ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,7 +27,6 @@ (define-module (guix build cargo-build-system) #:use-module ((guix build gnu-build-system) #:prefix gnu:) #:use-module (guix build json) #:use-module ((guix build utils) #:hide (delete)) - #:use-module (guix build cargo-utils) #:use-module (ice-9 popen) #:use-module (ice-9 rdelim) #:use-module (ice-9 ftw) @@ -222,13 +222,19 @@ (define* (configure #:key inputs (when (file-exists? "Cargo.lock") (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. +;; See: https://github.com/rust-lang/cargo/issues/11063. (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)) + "Add a stub checksum to each crate in VENDOR-DIR." + (with-directory-excursion vendor-dir + (call-with-output-file ".cargo-checksum.json" + (cut display "{\"files\":{}}" <>)) + (for-each (lambda (dir) + (copy-file ".cargo-checksum.json" + (string-append dir "/.cargo-checksum.json"))) + (drop (scandir ".") 3)) + (delete-file ".cargo-checksum.json"))) (define* (build #:key parallel-build? base-commit: 5f92f009a19c1a5a8b7df5a7bcb1e1f283a953f8 -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 05 06:04:26 2025 Received: (at 75321-done) by debbugs.gnu.org; 5 Jan 2025 11:04:26 +0000 Received: from localhost ([127.0.0.1]:60075 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tUOQk-0003eF-JQ for submit@debbugs.gnu.org; Sun, 05 Jan 2025 06:04:26 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:51689) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tUOQg-0003e1-RA for 75321-done@debbugs.gnu.org; Sun, 05 Jan 2025 06:04:24 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-436249df846so93120305e9.3 for <75321-done@debbugs.gnu.org>; Sun, 05 Jan 2025 03:04:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736075061; x=1736679861; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=16TFq3t/Ws7E//jzm6zBE9OdY25Hz5XT8xtFN49egaw=; b=Vaj8BS4N6P4hvpk1HF608k0hmnggWS2LPXiFrU79gTDm0GoZgD0meKXvpZqzs+n7w9 xE/8Cq84BFU9kbDlNZbsnbzKh2jSpd1QXhPA9kEB/+iqCqeV7s5bmUq5z+4DNZffKUA3 e+B3HyJ07IMm70ykOA5/zfbD7TJRfmhLI4SBB8KhFqgcML+hTrn4T1fKlNgpXKAkr75b mqG3vjBsbDLNlxcnBPoPistICLZukbsHmj3u08ZwihjFiNa8wjYINtAbjjnilbmQsEK5 qnaL6kiYL+GJDYqiIvjuRVE0LL/9g/v0vwu+1/6gZD6hARFO4lwByxvl2K74E48lc3HE rZHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736075061; x=1736679861; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=16TFq3t/Ws7E//jzm6zBE9OdY25Hz5XT8xtFN49egaw=; b=vSimHEpHZBv/VLD+8PcrSBWVFAK/7Yi6bz+nTrvfsKm0d2m7kPt8Zh5RIwFF22hFPv Qu+xyohIggbBpKCB5qrhkBKCH/8nak0JtyEznpiECYSy/67BOfWXdlNvHlezKUzxyTj+ fEs4yHJUigbCxqnWQj4aLe2oFNoracN5qBXPxrt0PfO2gUo7PboQg1WTWxY77AChDRBp 9qR30DHc3tyqM71EzXQLbstqmFrK0a5Krh9BTtKKFquPUVWWrPOxnZMCcHhaRCKaYf6D jrzzTv0Dj4iMvf4BBY4U8sc4N9zzI/Llllm64IFLGtOJILHbb2/exSov4LLeXq4oLsmY lK2w== X-Gm-Message-State: AOJu0YxVvCE2fJyb6QNu4qJVYdM89I2h1RxOBVeIg6UQ6q8hxvGtmgFs 5ipOUikDwk1mteu0b40S7MuT8UZjZeQODnlpLsRMR8r+AVqPeg6FPOOtS8X8 X-Gm-Gg: ASbGnctXbFqKfhOWzsIfQqGZDIeUDEdoBWyGW7myjYAoCUEceZMOLrambIkjznYHB3+ kLHYH1z7Ngq0a+3hkXSVZd+jpsL+GqagAWuAZ5lpFDxydZv35nfRzR0aAgj12VHtkyk0qdBWc3u +cRc47kE8x96qI+oBCJDQHKGHmS/vJD5KHulvMPmPakka+WHK88QFL3iqNF6AHHHxBihoYWoNO9 9op/qv6qXmAlGrGa1AvPbNbN3ixM2KEShpVMDUN/pO9v4EJT4Rs1lKy X-Google-Smtp-Source: AGHT+IEt23kAMoYK8YKDMqssTtZFvRG6E1T4rgQFRlvkll5KADucoB0T/Os61yqgcSGC9YcfY0Fesg== X-Received: by 2002:a05:600c:3b0c:b0:436:488f:4f3 with SMTP id 5b1f17b1804b1-43668646390mr493537635e9.17.1736075061207; Sun, 05 Jan 2025 03:04:21 -0800 (PST) Received: from localhost ([141.226.10.168]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4366127c515sm538691215e9.30.2025.01.05.03.04.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jan 2025 03:04:20 -0800 (PST) Date: Sun, 5 Jan 2025 13:03:56 +0200 From: Efraim Flashner To: Herman Rimm Subject: Re: [bug#75321] [PATCH rust-team] build: cargo-build-system: Use Cargo checksum stubs. Message-ID: Mail-Followup-To: Efraim Flashner , Herman Rimm , 75321-done@debbugs.gnu.org References: <20e1578fa994018d6c63f01312f3d99852e656e2.1735920229.git.herman@rimm.ee> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="+L1hz9Ms15oKHPD7" Content-Disposition: inline In-Reply-To: <20e1578fa994018d6c63f01312f3d99852e656e2.1735920229.git.herman@rimm.ee> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 75321-done Cc: 75321-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) --+L1hz9Ms15oKHPD7 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable This saves an incredible amount of time especially on slower machines (aka aarch64 and riscv64), and was on my TODO list for years. Thanks! --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --+L1hz9Ms15oKHPD7 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmd6ZxgACgkQQarn3Mo9 g1G4tQ//Ukgpgp0Reivd/P566dwGMz5+0b0Ha85+b/igGBWPnOE7QrqGJ9xWdqrm GeNAjhNPohq0pJjQSeM6nkwQNQ1CImHsWJnYevC+PTtLCnTQ/uJQCD9YJAyPhrj3 FeRVwU5cIcCfzLqAWkLxpVNG94LlVfsgDXNR/UjinoOdkTGL947sVEc82x4/+A9S ukBGVP9LdNn2UGNB/KXl+ayyOWfW/JkGPPbvZNsZbPrs3olJvNpzWmA94pAtVUOc zS2vqOlYtdQc/w9cXrDdPdqPYmTPHuJf6oCYlkP5om5rSrFf3Jz4/5yR6Oul40Ch hXPFr1Nqgbr96yrw594qYdSBIFkRKTrvcpV0nJqpI4ocduYN6LghtN2ajrYwPaHQ nBmeI5yxWgorcpu+3QK3f9CL4E97jPb2ujxKDCOU6Wv7syGHZ8bkApLYsld1uA6q SFbliDMTXAP2Cle8yUBuM4IgBgXigyjLiUVu6+iQBF6lSA8hV84xNNGS8IMupFun FFXxbXFJjPVPLtFkp15duR/e6UBmYQqt+5HoYgpCk21KSZshWxHP0ywFq1PNHA22 jBqjwGfiKAIHyoI+fPP8MlthZam/ZrG+olm66+0xRB3jI0KGni2oAuhlUOe2mtbK leBUgNlM5RFdcAjrYyRTV35E/4ZSGpeyEBYOchtVu8faEW9fNwo= =2Kgz -----END PGP SIGNATURE----- --+L1hz9Ms15oKHPD7-- From unknown Tue Jun 17 20:20:17 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 02 Feb 2025 12:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator