diff options
| author | Christopher Baines <mail@cbaines.net> | 2024-03-16 10:19:30 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2024-03-16 10:19:30 +0000 |
| commit | 618cae45dc2a45079e910e72be2062c58590f262 (patch) | |
| tree | 45536e51dafe3d34bd2cf55ee252e3345bf08803 /gnu/packages/rust.scm | |
| parent | 2ee54513196bad8e663e78ac695b6ffa0da49051 (diff) | |
| parent | 00bf07ecccee86da4ced281bd28948c96db284e6 (diff) | |
Merge remote-tracking branch 'savannah/master' into gnome-team
Change-Id: I775274c2693536e2efa36c9abca4c54c5c458e26
Diffstat (limited to 'gnu/packages/rust.scm')
| -rw-r--r-- | gnu/packages/rust.scm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 1f129a93bd..60aa9b1ea0 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -49,6 +49,7 @@ #:use-module (gnu packages libffi) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) + #:use-module (gnu packages llvm-meta) #:use-module (gnu packages mingw) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -905,7 +906,7 @@ safety and thread safety guarantees.") (("features = \\[\"fs\"" all) (string-append all ", \"use-libc\"")))))))))) -(define rust-1.74 +(define-public rust-1.74 (let ((base-rust (rust-bootstrapped-package rust-1.73 "1.74.1" "07930r17dkj3dnsrmilywb6p9i2g2jx56ndfpa2wh8crzhi3xnv7"))) (package @@ -937,7 +938,7 @@ safety and thread safety guarantees.") (delete 'revert-riscv-pause-instruction)))) (package-arguments base-rust)))))) -(define rust-1.75 +(define-public rust-1.75 (let ((base-rust (rust-bootstrapped-package rust-1.74 "1.75.0" "1260mf3066ki6y55pvr35lnf54am6z96a3ap3hniwd4xpi2rywsv"))) (package @@ -964,7 +965,9 @@ safety and thread safety guarantees.") (let ((base-rust rust-1.75)) (package (inherit base-rust) - (properties (alist-delete 'hidden? (package-properties base-rust))) + (properties (append + (alist-delete 'hidden? (package-properties base-rust)) + (clang-compiler-cpu-architectures "15"))) (outputs (cons* "rust-src" "tools" (package-outputs base-rust))) (source (origin |