[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/137: gnu: rust: Update to 1.74.1.
From: |
guix-commits |
Subject: |
02/137: gnu: rust: Update to 1.74.1. |
Date: |
Thu, 21 Dec 2023 04:25:54 -0500 (EST) |
efraim pushed a commit to branch rust-team
in repository guix.
commit ae60fc24104b5410fe93e8acbe211ef99b1de325
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Dec 17 12:59:13 2023 +0200
gnu: rust: Update to 1.74.1.
* gnu/packages/rust.scm (rust-1.74): New variable.
(rust): Inherit from rust-1.74.
[arguments]: Don't inherit #:tests.
Change-Id: I9724ccbc93bbfd4e1bdf1d6a20dfa7a4d0ea3a5e
---
gnu/packages/rust.scm | 31 +++++++++++++++++++++++++++----
1 file changed, 27 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index d953b56990..e3a7944d9b 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -820,6 +820,29 @@ safety and thread safety guarantees.")
(("features = \\[\"fs\"" all)
(string-append all ", \"use-libc\""))))))))))
+(define rust-1.74
+ (let ((base-rust (rust-bootstrapped-package rust-1.73 "1.74.1"
+ "07930r17dkj3dnsrmilywb6p9i2g2jx56ndfpa2wh8crzhi3xnv7")))
+ (package
+ (inherit base-rust)
+ (source
+ (origin
+ (inherit (package-source base-rust))
+ (snippet
+ '(begin
+ (for-each delete-file-recursively
+ '("src/llvm-project"
+ "vendor/tikv-jemalloc-sys/jemalloc"))
+ ;; Remove vendored dynamically linked libraries.
+ ;; find . -not -type d -executable -exec file {} \+ | grep ELF
+ ;; Also remove the bundled (mostly Windows) libraries.
+ (for-each delete-file
+ (find-files "vendor" "\\.(a|dll|exe|lib)$"))
+ ;; Adjust vendored dependency to explicitly use rustix with libc
backend.
+ (substitute* "vendor/tempfile/Cargo.toml"
+ (("features = \\[\"fs\"" all)
+ (string-append all ", \"use-libc\""))))))))))
+
(define (make-ignore-test-list strs)
"Function to make creating a list to ignore tests a bit easier."
(map (lambda (str)
@@ -834,14 +857,14 @@ safety and thread safety guarantees.")
;;; Here we take the latest included Rust, make it public, and re-enable tests
;;; and extra components such as rustfmt.
(define-public rust
- (let ((base-rust rust-1.73))
+ (let ((base-rust rust-1.74))
(package
(inherit base-rust)
(outputs (cons* "rust-src" "tools" (package-outputs base-rust)))
(arguments
- (substitute-keyword-arguments (package-arguments base-rust)
- ((#:tests? _ #f)
- (not (%current-target-system)))
+ (substitute-keyword-arguments
+ (strip-keyword-arguments '(#:tests?)
+ (package-arguments base-rust))
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'relax-gdb-auto-load-safe-path
- 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 <=
- 01/137: gnu: rust: Move remove-uninstall-script to rust., guix-commits, 2023/12/21
- 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