me/guix
Archived
1
0
Fork 0
Code Activity

gnu: rust: Update to 1.74.1.

Browse source 
* gnu/packages/rust.scm (rust-1.74): New variable.
(rust): Inherit from rust-1.74.
[arguments]: Don't inherit #:tests.

Change-Id: I9724ccbc93bbfd4e1bdf1d6a20dfa7a4d0ea3a5e
This commit is contained in:
Efraim Flashner 2023-12-17 12:59:13 +02:00
parent 072a9c60ab
commit 4bf325381f
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gnu/packages/rust.scm
View file

@ -824,6 +824,29 @@ safety and thread safety guarantees.")
(("features = \\[\"fs\"" all) (("features = \\[\"fs\"" all)
(string-append all ", \"use-libc\"")))))))))) (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) (define (make-ignore-test-list strs)
"Function to make creating a list to ignore tests a bit easier." "Function to make creating a list to ignore tests a bit easier."
(map (lambda (str) (map (lambda (str)
@ -838,15 +861,15 @@ safety and thread safety guarantees.")
;;; Here we take the latest included Rust, make it public, and re-enable tests ;;; Here we take the latest included Rust, make it public, and re-enable tests
;;; and extra components such as rustfmt. ;;; and extra components such as rustfmt.
(define-public rust (define-public rust
(let ((base-rust rust-1.73)) (let ((base-rust rust-1.74))
(package (package
(inherit base-rust) (inherit base-rust)
(properties (alist-delete 'hidden? (package-properties base-rust))) (properties (alist-delete 'hidden? (package-properties base-rust)))
(outputs (cons* "rust-src" "tools" (package-outputs base-rust))) (outputs (cons* "rust-src" "tools" (package-outputs base-rust)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments base-rust) (substitute-keyword-arguments
((#:tests? _ #f) (strip-keyword-arguments '(#:tests?)
(not (%current-target-system))) (package-arguments base-rust))
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-after 'unpack 'relax-gdb-auto-load-safe-path (add-after 'unpack 'relax-gdb-auto-load-safe-path