diff mbox series

[bug#75321,rust-team] build: cargo-build-system: Use Cargo checksum stubs.

Message ID 20e1578fa994018d6c63f01312f3d99852e656e2.1735920229.git.herman@rimm.ee
State New
Headers
Series [bug#75321,rust-team] build: cargo-build-system: Use Cargo checksum stubs. |

Commit Message

Herman Rimm Jan. 3, 2025, 4:07 p.m. UTC 
  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(-)


base-commit: 5f92f009a19c1a5a8b7df5a7bcb1e1f283a953f8

Comments

Efraim Flashner Jan. 5, 2025, 11:03 a.m. UTC | #1 
This saves an incredible amount of time especially on slower machines
(aka aarch64 and riscv64), and was on my TODO list for years.  Thanks!
diff mbox series

Patch

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 <kuba@kadziolka.net>
 ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2025 Herman Rimm <herman@rimm.ee>
 ;;;
 ;;; 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?