GNU bug report logs - #76345
[PATCH 0/2] Add rust 1.83, 1.84

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 76345 in the body.
You can then email your comments to 76345 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <z572 <at> z572.online>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/2] Add rust 1.83, 1.84
Date: Mon, 17 Feb 2025 01:54:20 +0800

Zheng Junjie (2):
  gnu: Add rust-1.83.
  gnu: Add rust-1.84.

 gnu/packages/rust.scm | 61 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)


base-commit: c9abfacd9f58f7365668b67a8125640b7497932a
prerequisite-patch-id: 86656dea0764289b9804e5bf93b117a2a7fbaef2
prerequisite-patch-id: bb36d4d385fb5e38c4d1ef95c8e318302b7ba478
prerequisite-patch-id: 12f7cee019bd7468cc973cbc1e6f327d1971c692
prerequisite-patch-id: 52902db6f55b87c31f48dce32c1b5ba0199b7d88
prerequisite-patch-id: d16d47e0d40cf195f8b52dfc99b0560115a892e9
-- 
2.47.1

Message #8 received at 76345 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <z572 <at> z572.online>
To: 76345 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: Add rust-1.83.
Date: Mon, 17 Feb 2025 02:02:40 +0800

* gnu/packages/rust.scm (rust-1.83): New variable.

Change-Id: I1cb42d71bed57fe766d7434d2aa950110eab0ed3
---
 gnu/packages/rust.scm | 44 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index abaf7166fd5..d6b78209ac2 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -13,7 +13,7 @@
 ;;; Copyright © 2020 Matthew James Kraai <kraai <at> ftbfs.org>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2021 (unmatched parenthesis <paren <at> disroot.org>
-;;; Copyright © 2022 Zheng Junjie <873216071 <at> qq.com>
+;;; Copyright © 2022, 2025 Zheng Junjie <z572 <at> z572.online>
 ;;; Copyright © 2022 Jim Newsome <jnewsome <at> torproject.org>
 ;;; Copyright © 2022 Mark H Weaver <mhw <at> netris.org>
 ;;; Copyright © 2023 Fries <fries1234 <at> protonmail.com>
@@ -1041,6 +1041,48 @@ (define-public rust-1.82
                  (generate-all-checksums "vendor"))))))))))
 
 
+(define-public rust-1.83
+  (let ((base-rust
+         (rust-bootstrapped-package
+          rust-1.82 "1.83.0"
+          "0vhwhk4cbyppnz0lcazfjyddyz811fgvadfxswldicpashxpfbbj")))
+    (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.10.1/Cargo.toml"
+                            "vendor/tempfile-3.13.0/Cargo.toml")
+               (("features = \\[\"fs\"" all)
+                (string-append all ", \"use-libc\"")))))))
+      (inputs (modify-inputs (package-inputs base-rust)
+                ;; Need llvm >= 18.0
+                (replace "llvm" llvm-18)))
+      (arguments
+       (substitute-keyword-arguments (package-arguments base-rust)
+         ((#:phases phases)
+          `(modify-phases ,phases
+             (add-after 'configure 'not-download-ci-llvm
+               (lambda _
+                 (substitute* "config.toml"
+                   (("\\[llvm\\]")
+                    "[llvm]\ndownload-ci-llvm = false")))))))))))
+
+
 (define (make-ignore-test-list strs)
   "Function to make creating a list to ignore tests a bit easier."
   (map (lambda (str)
-- 
2.47.1

Message #11 received at 76345 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <z572 <at> z572.online>
To: 76345 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: Add rust-1.84.
Date: Mon, 17 Feb 2025 02:02:41 +0800

* gnu/packages/rust.scm (rust-1.84): New variable.

Change-Id: I3d94cf252983e30aa68d55933a62e767e6530e68
---
 gnu/packages/rust.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index d6b78209ac2..33d7b123f39 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -1082,6 +1082,23 @@ (define-public rust-1.83
                    (("\\[llvm\\]")
                     "[llvm]\ndownload-ci-llvm = false")))))))))))
 
+(define-public rust-1.84
+  (let ((base-rust
+         (rust-bootstrapped-package
+          rust-1.83 "1.84.1"
+          "0xdk3g1xq33fy4m7q6l38ba9ydxbanccyb0vczvlk998jvababsy")))
+    (package
+      (inherit base-rust)
+      (arguments
+       (substitute-keyword-arguments (package-arguments base-rust)
+         ((#:phases phases)
+          `(modify-phases ,phases
+             (add-after 'configure 'not-download-rustc
+               (lambda _
+                 (substitute* "config.toml"
+                   (("\\[rust\\]")
+                    "[rust]\ndownload-rustc = false")))))))))))
+
 
 (define (make-ignore-test-list strs)
   "Function to make creating a list to ignore tests a bit easier."
-- 
2.47.1

Message #16 received at 76345-done <at> debbugs.gnu.org (full text, mbox):

From: Z572 <zhengjunjie <at> iscas.ac.cn>
To: Zheng Junjie <z572 <at> z572.online>
Cc: 76345-done <at> debbugs.gnu.org, Efraim Flashner <efraim <at> flashner.co.il>,
 Divya Ranjan Pattanaik <divya <at> subvertising.org>
Subject: Re: [bug#76345] [PATCH 0/2] Add rust 1.83, 1.84
Date: Mon, 17 Feb 2025 08:50:55 +0800

[Message part 1 (text/plain, inline)]

Zheng Junjie <z572 <at> z572.online> writes:

> Zheng Junjie (2):
>   gnu: Add rust-1.83.
>   gnu: Add rust-1.84.
>
>  gnu/packages/rust.scm | 61 ++++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 60 insertions(+), 1 deletion(-)
>
>
> base-commit: c9abfacd9f58f7365668b67a8125640b7497932a
> prerequisite-patch-id: 86656dea0764289b9804e5bf93b117a2a7fbaef2
> prerequisite-patch-id: bb36d4d385fb5e38c4d1ef95c8e318302b7ba478
> prerequisite-patch-id: 12f7cee019bd7468cc973cbc1e6f327d1971c692
> prerequisite-patch-id: 52902db6f55b87c31f48dce32c1b5ba0199b7d88
> prerequisite-patch-id: d16d47e0d40cf195f8b52dfc99b0560115a892e9

oops, no notice that rust-team has updated rust.

closing.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.