mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-07 11:29:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: cargo-build-system: Use Cargo checksum stubs.

Browse source 
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
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
Herman Rimm 2025-01-03 17:07:23 +01:00 • committed by Efraim Flashner
parent d61fe42cb7
commit 1a359b4392
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
guix/build/cargo-build-system.scm
View file

@ -6,6 +6,7 @@
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2025 Herman Rimm <herman@rimm.ee>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -26,7 +27,6 @@
#:use-module ((guix build gnu-build-system) #:prefix gnu:) #:use-module ((guix build gnu-build-system) #:prefix gnu:)
#:use-module (guix build json) #:use-module (guix build json)
#:use-module ((guix build utils) #:hide (delete)) #:use-module ((guix build utils) #:hide (delete))
#:use-module (guix build cargo-utils)
#:use-module (ice-9 popen) #:use-module (ice-9 popen)
#:use-module (ice-9 rdelim) #:use-module (ice-9 rdelim)
#:use-module (ice-9 ftw) #:use-module (ice-9 ftw)
@ -223,13 +223,19 @@ directory = '" vendor-dir "'") port)
(when (file-exists? "Cargo.lock") (when (file-exists? "Cargo.lock")
(delete-file "Cargo.lock"))) (delete-file "Cargo.lock")))
;; After the 'patch-generated-file-shebangs phase any vendored crates who have ;; See: https://github.com/rust-lang/cargo/issues/11063.
;; their shebangs patched will have a mismatch on their checksum.
(define* (patch-cargo-checksums #:key (define* (patch-cargo-checksums #:key
(vendor-dir "guix-vendor") (vendor-dir "guix-vendor")
#:allow-other-keys) #:allow-other-keys)
"Patch the checksums of the vendored crates after patching their shebangs." "Add a stub checksum to each crate in VENDOR-DIR."
(generate-all-checksums 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 (define* (build #:key
parallel-build? parallel-build?