all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#45307] [PATCH]: build-system/cargo: Use argument "--no-track" in "cargo install"
@ 2020-12-18  2:27 Zhu Zihao
       [not found] ` <handler.45307.B.160825848714001.ack@debbugs.gnu.org>
  2020-12-31 12:41 ` bug#45307: [PATCH]: build-system/cargo: Use argument "--no-track" in "cargo install" Efraim Flashner
  0 siblings, 2 replies; 4+ messages in thread
From: Zhu Zihao @ 2020-12-18  2:27 UTC (permalink / raw)
  To: 45307


[-- Attachment #1.1: Type: text/plain, Size: 335 bytes --]


After we update rust to rust-1.45, cargo install now create
.crates2.json instead of .crates.toml. So the hack we use in
c1cc0c4865a8bfff43c5c9bd6ae8dcadb061c8a0 doesn't work.

I checked the ArchLinux Rust packaging guideline and found that we
should use --no-track in "cargo install" to prevent cargo install these
files to prefix.


[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 255 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-build-system-cargo-Use-argument-no-track-in-cargo-in.patch --]
[-- Type: text/x-patch, Size: 1278 bytes --]

From fadf6149f998758c1d663d3dbe1c6fe8a85e5700 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Fri, 18 Dec 2020 10:13:48 +0800
Subject: [PATCH] build-system/cargo: Use argument "--no-track" in "cargo
 install"

Prevent cargo install .crates.toml or .crates2.json to prefix.

* guix/build/cargo-build-system(install):
Add argument "--no-track" in "cargo install".
Remove stale hack.
---
 guix/build/cargo-build-system.scm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm
index c7beffc6e4..1d21b33895 100644
--- a/guix/build/cargo-build-system.scm
+++ b/guix/build/cargo-build-system.scm
@@ -183,13 +183,9 @@ directory = '" port)
     ;; otherwise cargo will raise an error.
     (or skip-build?
         (not (has-executable-target?))
-        (invoke "cargo" "install" "--path" "." "--root" out
+        (invoke "cargo" "install" "--no-track" "--path" "." "--root" out
                 "--features" (string-join features)))
 
-    ;; This is a file which we definitely don't need installed.
-    (when (file-exists? (string-append out "/.crates.toml"))
-      (delete-file (string-append out "/.crates.toml")))
-
     #t))
 
 (define %standard-phases
-- 
2.29.2


[-- Attachment #3: Type: text/plain, Size: 100 bytes --]


-- 
Retrieve my PGP public key:

  gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F

Zihao

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-12-31 12:51 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-18  2:27 [bug#45307] [PATCH]: build-system/cargo: Use argument "--no-track" in "cargo install" Zhu Zihao
     [not found] ` <handler.45307.B.160825848714001.ack@debbugs.gnu.org>
2020-12-18  2:30   ` [bug#45307] Acknowledgement ([PATCH]: build-system/cargo: Use argument "--no-track" in "cargo install") Zhu Zihao
2020-12-31  9:50     ` Zhu Zihao
2020-12-31 12:41 ` bug#45307: [PATCH]: build-system/cargo: Use argument "--no-track" in "cargo install" Efraim Flashner

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.