[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#72821] [PATCH 3/4] gnu: rust: Add rust 1.80.1
From: |
brennan |
Subject: |
[bug#72821] [PATCH 3/4] gnu: rust: Add rust 1.80.1 |
Date: |
Mon, 26 Aug 2024 13:40:56 -0400 |
From: Brennan Vincent <brennan@umanwizard.com>
gnu/packages/rust.scm (new variable): rust-1.80
Change-Id: Ie7dd276f7b4d606660557f3da42064b04dda1435
---
gnu/packages/rust.scm | 37 ++++++++++++++++++++++++++++++++++---
1 file changed, 34 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 403c3933d4..0d3a11b696 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -1020,6 +1020,33 @@ (define-public rust-1.79
(("features = \\[\"fs\"" all)
(string-append all ", \"use-libc\""))))))))))
+(define-public rust-1.80
+ (let ((base-rust (rust-bootstrapped-package rust-1.79 "1.80.1"
+
"1i1dbpwnv6ak244lapsxvd26w6sbas9g4l6crc8bip2275j8y2rc")))
+ (package
+ (inherit base-rust)
+ (source
+ (origin
+ (inherit (package-source base-rust))
+ (snippet
+ '(begin
+ (for-each delete-file-recursively
+ '("src/llvm-project"
+ "vendor/jemalloc-sys-0.5.3+5.3.0-patched/jemalloc"
+ "vendor/jemalloc-sys-0.5.4+5.3.0-patched/jemalloc"
+ "vendor/openssl-src-111.28.2+1.1.1w/openssl"
+
"vendor/tikv-jemalloc-sys-0.5.4+5.3.0-patched/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-3.7.1/Cargo.toml"
+ "vendor/tempfile-3.10.1/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)
@@ -1070,9 +1097,13 @@ (define-public rust
(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\"")))))))
+ (for-each
+ (lambda (f)
+ (substitute* f
+ (("features = \\[\"fs\"" all)
+ (string-append all ", \"use-libc\""))))
+ '("vendor/tempfile-3.10.1/Cargo.toml"
+ "vendor/tempfile-3.7.1/Cargo.toml"))))))
(arguments
(substitute-keyword-arguments
(strip-keyword-arguments '(#:tests?)
--
2.45.2