diff options
| author | Marius Bakke <marius@gnu.org> | 2022-12-02 19:13:45 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-12-02 19:13:45 +0100 |
| commit | f2b6350a507158b2a0ed28ada69d8ca3f544d5e5 (patch) | |
| tree | 0dc9a7d9702e912b2fa098942a75e3e925629157 /gnu/packages/rust.scm | |
| parent | c5e15ef4ddcbe7ebf77b4d24a99707396121cb6c (diff) | |
| parent | 365b0b55334ab61e73f368f142af7aa1c3a3d28a (diff) | |
| download | guix-f2b6350a507158b2a0ed28ada69d8ca3f544d5e5.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/rust.scm')
| -rw-r--r-- | gnu/packages/rust.scm | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index bfa5e1bc68..c0f663977a 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -625,6 +625,11 @@ safety and thread safety guarantees.") rust-1.63 "1.64.0" "018j720b2n12slp4xk64jc6shkncd46d621qdyzh2a8s3r49zkdk"))) (package (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + (patches (search-patches "rust-1.64-fix-riscv64-bootstrap.patch")) + (patch-flags '("-p1" "--reverse")))) (arguments (substitute-keyword-arguments (package-arguments base-rust) ((#:phases phases) @@ -638,8 +643,16 @@ safety and thread safety guarantees.") (generate-all-checksums "vendor")))))))))) (define rust-1.65 - (rust-bootstrapped-package - rust-1.64 "1.65.0" "0f005kc0vl7qyy298f443i78ibz71hmmh820726bzskpyrkvna2q")) + (let ((base-rust + (rust-bootstrapped-package + rust-1.64 "1.65.0" "0f005kc0vl7qyy298f443i78ibz71hmmh820726bzskpyrkvna2q"))) + (package + (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + (patches '()) + (patch-flags '("-p1"))))))) ;;; Note: Only the latest versions of Rust are supported and tested. The ;;; intermediate rusts are built for bootstrapping purposes and should not |