From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 74767@debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>,
Efraim Flashner <efraim@flashner.co.il>
Subject: [bug#74767] [PATCH rust-team 01/23] build/cargo: Delete trailing #t in phases.
Date: Tue, 10 Dec 2024 23:21:04 +0900 [thread overview]
Message-ID: <5b23f5cb76b23feed1002f62e7f20eecc1aeda7c.1733840023.git.maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <cover.1733840023.git.maxim.cournoyer@gmail.com>
* 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
next prev parent reply other threads:[~2024-12-10 14:23 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-10 14:15 [bug#74767] [PATCH rust-team 00/23] Add py-spy Maxim Cournoyer
2024-12-10 14:21 ` Maxim Cournoyer [this message]
2024-12-10 14:21 ` [bug#74767] [PATCH rust-team 02/23] build/cargo: Honor #:parallel-build? and #:parallel-tests? arguments Maxim Cournoyer
2024-12-10 15:37 ` Efraim Flashner
2024-12-11 1:11 ` Maxim Cournoyer
2024-12-10 14:21 ` [bug#74767] [PATCH rust-team 03/23] build/cargo: Resolve byte compilation warning Maxim Cournoyer
2024-12-10 14:21 ` [bug#74767] [PATCH rust-team 04/23] gnu: Add rust-read-process-memory-0.1 Maxim Cournoyer
2024-12-10 14:21 ` [bug#74767] [PATCH rust-team 05/23] gnu: Update ust-wasmparser to 0.218 Maxim Cournoyer
2024-12-10 14:21 ` [bug#74767] [PATCH rust-team 06/23] gnu: rust-ruzstd-0.7: Update to 0.7.3 Maxim Cournoyer
2024-12-10 14:21 ` [bug#74767] [PATCH rust-team 07/23] gnu: rust-libc-0.2: Update to 0.2.168 Maxim Cournoyer
2024-12-10 14:21 ` [bug#74767] [PATCH rust-team 08/23] gnu: rust-proc-macro2-1: Update to 1.0.92 Maxim Cournoyer
2024-12-10 14:21 ` [bug#74767] [PATCH rust-team 09/23] gnu: rust-syn-test-suite-0.0.0: Update to 0.0.0+test Maxim Cournoyer
2024-12-10 14:21 ` [bug#74767] [PATCH rust-team 10/23] gnu: rust-syn-2: Update to 2.0.90 Maxim Cournoyer
2024-12-10 14:21 ` [bug#74767] [PATCH rust-team 11/23] gnu: Add rust-zerocopy-derive-0.8 Maxim Cournoyer
2024-12-10 14:21 ` [bug#74767] [PATCH rust-team 12/23] gnu: rust-object-0.36: Update to 0.36.5 Maxim Cournoyer
2024-12-10 14:21 ` [bug#74767] [PATCH rust-team 13/23] gnu: rust-gimli-0.31: Update to 0.31.1 Maxim Cournoyer
2024-12-10 14:21 ` [bug#74767] [PATCH rust-team 14/23] gnu: Add rust-goblin-0.9 Maxim Cournoyer
2024-12-10 14:21 ` [bug#74767] [PATCH rust-team 15/23] gnu: Add rust-proc-maps-0.4 Maxim Cournoyer
2024-12-10 14:21 ` [bug#74767] [PATCH rust-team 16/23] gnu: Add rust-mark-flaky-tests-macro-1 Maxim Cournoyer
2024-12-10 14:21 ` [bug#74767] [PATCH rust-team 17/23] gnu: Add rust-mark-flaky-tests-1 Maxim Cournoyer
2024-12-10 14:21 ` [bug#74767] [PATCH rust-team 18/23] gnu: Add rust-remoteprocess-0.5 Maxim Cournoyer
2024-12-10 14:21 ` [bug#74767] [PATCH rust-team 19/23] gnu: Add rust-lru-0.10 Maxim Cournoyer
2024-12-10 14:21 ` [bug#74767] [PATCH rust-team 20/23] gnu: rust-rle-decode-fast-1: Update to 1.0.3 Maxim Cournoyer
2024-12-10 14:21 ` [bug#74767] [PATCH rust-team 21/23] gnu: rust-inferno-0.11: Update to 0.11.21 Maxim Cournoyer
2024-12-10 14:21 ` [bug#74767] [PATCH rust-team 22/23] gnu: Add rust-py-spy-testdata-0.1 Maxim Cournoyer
2024-12-10 14:21 ` [bug#74767] [PATCH rust-team 23/23] gnu: Add py-spy Maxim Cournoyer
2024-12-11 1:48 ` [bug#74767] [PATCH PATCH rust-team v2 01/24] gnu: rust-1.55: Use minimal variant of python-wrapper Maxim Cournoyer
2024-12-11 1:48 ` [bug#74767] [PATCH PATCH rust-team v2 02/24] build/cargo: Delete trailing #t in phases Maxim Cournoyer
2024-12-11 1:48 ` [bug#74767] [PATCH PATCH rust-team v2 03/24] build/cargo: Honor #:parallel-build? and #:parallel-tests? arguments Maxim Cournoyer
2024-12-11 1:48 ` [bug#74767] [PATCH PATCH rust-team v2 04/24] build/cargo: Resolve byte compilation warning Maxim Cournoyer
2024-12-11 1:48 ` [bug#74767] [PATCH PATCH rust-team v2 05/24] gnu: Add rust-read-process-memory-0.1 Maxim Cournoyer
2024-12-11 1:48 ` [bug#74767] [PATCH PATCH rust-team v2 06/24] gnu: Update rust-wasmparser to 0.218 Maxim Cournoyer
2024-12-11 1:48 ` [bug#74767] [PATCH PATCH rust-team v2 07/24] gnu: rust-ruzstd-0.7: Update to 0.7.3 Maxim Cournoyer
2024-12-11 1:48 ` [bug#74767] [PATCH PATCH rust-team v2 08/24] gnu: rust-libc-0.2: Update to 0.2.168 Maxim Cournoyer
2024-12-11 1:48 ` [bug#74767] [PATCH PATCH rust-team v2 09/24] gnu: rust-proc-macro2-1: Update to 1.0.92 Maxim Cournoyer
2024-12-11 1:48 ` [bug#74767] [PATCH PATCH rust-team v2 10/24] gnu: rust-syn-test-suite-0.0.0: Update to 0.0.0+test Maxim Cournoyer
2024-12-11 1:48 ` [bug#74767] [PATCH PATCH rust-team v2 11/24] gnu: rust-syn-2: Update to 2.0.90 Maxim Cournoyer
2024-12-11 1:48 ` [bug#74767] [PATCH PATCH rust-team v2 12/24] gnu: Add rust-zerocopy-derive-0.8 Maxim Cournoyer
2024-12-11 1:49 ` [bug#74767] [PATCH PATCH rust-team v2 13/24] gnu: rust-object-0.36: Update to 0.36.5 Maxim Cournoyer
2024-12-11 1:49 ` [bug#74767] [PATCH PATCH rust-team v2 14/24] gnu: rust-gimli-0.31: Update to 0.31.1 Maxim Cournoyer
2024-12-11 1:49 ` [bug#74767] [PATCH PATCH rust-team v2 15/24] gnu: Add rust-goblin-0.9 Maxim Cournoyer
2024-12-11 1:49 ` [bug#74767] [PATCH PATCH rust-team v2 16/24] gnu: Add rust-proc-maps-0.4 Maxim Cournoyer
2024-12-11 1:49 ` [bug#74767] [PATCH PATCH rust-team v2 17/24] gnu: Add rust-mark-flaky-tests-macro-1 Maxim Cournoyer
2024-12-11 1:49 ` [bug#74767] [PATCH PATCH rust-team v2 18/24] gnu: Add rust-mark-flaky-tests-1 Maxim Cournoyer
2024-12-11 1:49 ` [bug#74767] [PATCH PATCH rust-team v2 19/24] gnu: Add rust-remoteprocess-0.5 Maxim Cournoyer
2024-12-11 1:49 ` [bug#74767] [PATCH PATCH rust-team v2 20/24] gnu: Add rust-lru-0.10 Maxim Cournoyer
2024-12-11 1:49 ` [bug#74767] [PATCH PATCH rust-team v2 21/24] gnu: rust-rle-decode-fast-1: Update to 1.0.3 Maxim Cournoyer
2024-12-11 1:49 ` [bug#74767] [PATCH PATCH rust-team v2 22/24] gnu: rust-inferno-0.11: Update to 0.11.21 Maxim Cournoyer
2024-12-11 1:49 ` [bug#74767] [PATCH PATCH rust-team v2 23/24] gnu: Add rust-py-spy-testdata-0.1 Maxim Cournoyer
2024-12-11 1:49 ` [bug#74767] [PATCH PATCH rust-team v2 24/24] gnu: Add py-spy Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5b23f5cb76b23feed1002f62e7f20eecc1aeda7c.1733840023.git.maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=74767@debbugs.gnu.org \
--cc=efraim@flashner.co.il \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.