amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build/cargo: Delete trailing #t in phases.

Browse source 
* guix/build/cargo-build-system.scm (unpack-rust-crates): Delete trailing #t.
(configure, patch-cargo-checksums, package, install): Likewise.

Change-Id: I510a46b3d35cd292d71d5646d4a0436f7d77f98e
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
Maxim Cournoyer 2024-12-11 10:48:49 +09:00 • committed by Efraim Flashner
parent 283ecf51fc
commit e8ef2371e9
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -105,8 +105,7 @@ Cargo.toml file present at its root."
(for-each (lambda (crate) (for-each (lambda (crate)
(invoke "tar" "xzf" crate "-C" vendor-dir)) (invoke "tar" "xzf" crate "-C" vendor-dir))
(find-files "target/package" "\\.crate$")))) (find-files "target/package" "\\.crate$")))))
#t)
(define (rust-package? name) (define (rust-package? name)
(string-prefix? "rust-" name)) (string-prefix? "rust-" name))
@ -220,8 +219,7 @@ directory = '" vendor-dir "'") port)
;; during building, and in any case if one is not present it is created ;; during building, and in any case if one is not present it is created
;; during the 'build phase by cargo. ;; during the 'build phase by cargo.
(when (file-exists? "Cargo.lock") (when (file-exists? "Cargo.lock")
(delete-file "Cargo.lock")) (delete-file "Cargo.lock")))
#t)
;; After the 'patch-generated-file-shebangs phase any vendored crates who have ;; After the 'patch-generated-file-shebangs phase any vendored crates who have
;; their shebangs patched will have a mismatch on their checksum. ;; their shebangs patched will have a mismatch on their checksum.
@ -229,10 +227,10 @@ directory = '" vendor-dir "'") port)
(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." "Patch the checksums of the vendored crates after patching their shebangs."
(generate-all-checksums vendor-dir) (generate-all-checksums vendor-dir))
#t)
(define* (build #:key (define* (build #:key
parallel-build?
skip-build? skip-build?
(features '()) (features '())
(cargo-build-flags '("--release")) (cargo-build-flags '("--release"))
@ -311,8 +309,7 @@ directory = '" vendor-dir "'") port)
(find-files dir #:directories? #t)) (find-files dir #:directories? #t))
(delete-file-recursively dir))) (delete-file-recursively dir)))
(find-files "." "\\.crate$"))))) (find-files "." "\\.crate$")))))
(format #t "Not installing cargo sources, skipping `cargo package`.~%")) (format #t "Not installing cargo sources, skipping `cargo package`.~%")))
#t)
(define* (install #:key (define* (install #:key
inputs inputs
@ -348,9 +345,7 @@ directory = '" vendor-dir "'") port)
(for-each (lambda (crate) (for-each (lambda (crate)
(invoke "tar" "xzf" crate "-C" sources)) (invoke "tar" "xzf" crate "-C" sources))
(find-files registry "\\.crate$"))) (find-files registry "\\.crate$")))))
#t))
(define %standard-phases (define %standard-phases
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases