[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/137: gnu: rust: Move remove-uninstall-script to rust.
From: |
guix-commits |
Subject: |
01/137: gnu: rust: Move remove-uninstall-script to rust. |
Date: |
Thu, 21 Dec 2023 04:25:54 -0500 (EST) |
efraim pushed a commit to branch rust-team
in repository guix.
commit 8bbd709c4b3db22625b417a5f12a1fe5c254b3d8
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Dec 17 16:51:49 2023 +0200
gnu: rust: Move remove-uninstall-script to rust.
* gnu/packages/rust.scm (rust)[arguments]: Add 'remove-uninstall-script
phase.
(make-rust-sysroot)[arguments]: Remove 'remove-uninstall-script phase.
Change-Id: I45bcaaa89003693b490b914efbfa34236a8f4db6
---
gnu/packages/rust.scm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index ea95d27476..d953b56990 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -1036,6 +1036,12 @@ safety and thread safety guarantees.")
(mkdir-p (string-append out dest))
(copy-recursively "library" (string-append out dest
"/library"))
(copy-recursively "src" (string-append out dest "/src")))))
+ (add-after 'install 'remove-uninstall-script
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; This script has no use on Guix
+ ;; and it retains a reference to the host's bash.
+ (delete-file (string-append (assoc-ref outputs "out")
+ "/lib/rustlib/uninstall.sh"))))
(add-after 'install-rust-src 'wrap-rust-analyzer
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "tools")
"/bin")))
@@ -1187,12 +1193,6 @@ ar = \"" (search-input-file inputs (string-append
"/bin/" ,(ar-for-target target
(replace 'install
(lambda _
(invoke "./x.py" "install" "library/std")))
- (add-after 'install 'remove-uninstall-script
- (lambda* (#:key outputs #:allow-other-keys)
- ;; This script has no use on Guix
- ;; and it retains a reference to the host's bash.
- (delete-file (string-append (assoc-ref outputs "out")
- "/lib/rustlib/uninstall.sh"))))
(delete 'install-rust-src)
(delete 'wrap-rust-analyzer)
(delete 'wrap-rustc)))))
- branch rust-team updated (34eaf5714e -> 2f9f39f441), guix-commits, 2023/12/21
- 04/137: gnu: rust-1.55: Build without jemalloc., guix-commits, 2023/12/21
- 02/137: gnu: rust: Update to 1.74.1., guix-commits, 2023/12/21
- 01/137: gnu: rust: Move remove-uninstall-script to rust.,
guix-commits <=
- 07/137: gnu: rust-crossbeam-channel-0.5: Update to 0.5.9., guix-commits, 2023/12/21
- 08/137: gnu: rust-aho-corasick-1: Update to 1.1.2., guix-commits, 2023/12/21
- 18/137: gnu: rust-pcre2-sys-0.2: Update to 0.2.7., guix-commits, 2023/12/21
- 26/137: gnu: ripgrep: Update to 14.0.3., guix-commits, 2023/12/21
- 31/137: gnu: Add rust-shellexpand-3., guix-commits, 2023/12/21
- 27/137: gnu: Add rust-tui-0.19., guix-commits, 2023/12/21
- 40/137: gnu: Add rust-windows-implement-0.39., guix-commits, 2023/12/21
- 36/137: gnu: Add rust-windows-i686-gnu-0.39., guix-commits, 2023/12/21
- 48/137: gnu: Add rust-sqlite3-src-0.4., guix-commits, 2023/12/21
- 45/137: gnu: Add rust-vergen-7., guix-commits, 2023/12/21