[PATCH] gnu: Add rust-1.53.

  • Done
  • quality assurance status badge
Details
2 participants
  • Matthew James Kraai
  • Maxim Cournoyer
Owner
unassigned
Submitted by
Matthew James Kraai
Severity
normal

Debbugs page

Matthew James Kraai wrote 4 years ago
(address . guix-patches@gnu.org)(name . Matthew James Kraai)(address . kraai@ftbfs.org)
20210809134903.19916-1-kraai@ftbfs.org
* gnu/packages/rust.scm (rust-1.53): New variable.
---
gnu/packages/rust.scm | 28 +++++++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)

Toggle diff (47 lines)
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 73f94a3929..bb4da17243 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
;;; Copyright © 2020, 2021 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
-;;; Copyright © 2020 Matthew James Kraai <kraai@ftbfs.org>
+;;; Copyright © 2020, 2021 Matthew James Kraai <kraai@ftbfs.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1474,5 +1474,31 @@ move around."
(alist-replace "llvm" (list llvm-12)
(package-inputs base-rust))))))
+(define-public rust-1.53
+ (let ((base-rust
+ (rust-bootstrapped-package rust-1.52 "1.53.0"
+ "1f95p259dfp5ca118bg107rj3rqwlswy65dxn3hg8sqgl4wwmxsw")))
+ (package
+ (inherit base-rust)
+ (arguments
+ (substitute-keyword-arguments (package-arguments base-rust)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; Some tests got split out into separate files.
+ (replace 'patch-tests
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((bash (assoc-ref inputs "bash")))
+ (substitute* "library/std/src/process/tests.rs"
+ (("\"/bin/sh\"") (string-append "\"" bash "/bin/sh\"")))
+ (substitute* "library/std/src/sys/unix/process/process_common/tests.rs"
+ (("fn test_process_mask") "#[allow(unused_attributes)]
+ #[ignore]
+ fn test_process_mask"))
+ (substitute* "src/test/codegen/alloc-optimisation.rs"
+ (("// min-llvm-version: 10.0.1") "// no-system-llvm"))
+ (substitute* "src/test/ui/asm/sym.rs"
+ (("// min-llvm-version: 10.0.1") "// no-system-llvm"))
+ #t))))))))))
+
;; TODO(staging): Bump this variable to the latest packaged rust.
(define-public rust rust-1.45)
--
2.32.0
Maxim Cournoyer wrote 3 years ago
(name . Matthew James Kraai)(address . kraai@ftbfs.org)(address . 49956-done@debbugs.gnu.org)
87v91xjzjx.fsf@gmail.com
Hello,

Matthew James Kraai <kraai@ftbfs.org> writes:

Toggle quote (51 lines)
> * gnu/packages/rust.scm (rust-1.53): New variable.
> ---
> gnu/packages/rust.scm | 28 +++++++++++++++++++++++++++-
> 1 file changed, 27 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
> index 73f94a3929..bb4da17243 100644
> --- a/gnu/packages/rust.scm
> +++ b/gnu/packages/rust.scm
> @@ -10,7 +10,7 @@
> ;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
> ;;; Copyright © 2020, 2021 Jakub Kądziołka <kuba@kadziolka.net>
> ;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
> -;;; Copyright © 2020 Matthew James Kraai <kraai@ftbfs.org>
> +;;; Copyright © 2020, 2021 Matthew James Kraai <kraai@ftbfs.org>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -1474,5 +1474,31 @@ move around."
> (alist-replace "llvm" (list llvm-12)
> (package-inputs base-rust))))))
>
> +(define-public rust-1.53
> + (let ((base-rust
> + (rust-bootstrapped-package rust-1.52 "1.53.0"
> + "1f95p259dfp5ca118bg107rj3rqwlswy65dxn3hg8sqgl4wwmxsw")))
> + (package
> + (inherit base-rust)
> + (arguments
> + (substitute-keyword-arguments (package-arguments base-rust)
> + ((#:phases phases)
> + `(modify-phases ,phases
> + ;; Some tests got split out into separate files.
> + (replace 'patch-tests
> + (lambda* (#:key inputs #:allow-other-keys)
> + (let ((bash (assoc-ref inputs "bash")))
> + (substitute* "library/std/src/process/tests.rs"
> + (("\"/bin/sh\"") (string-append "\"" bash "/bin/sh\"")))
> + (substitute* "library/std/src/sys/unix/process/process_common/tests.rs"
> + (("fn test_process_mask") "#[allow(unused_attributes)]
> + #[ignore]
> + fn test_process_mask"))
> + (substitute* "src/test/codegen/alloc-optimisation.rs"
> + (("// min-llvm-version: 10.0.1") "// no-system-llvm"))
> + (substitute* "src/test/ui/asm/sym.rs"
> + (("// min-llvm-version: 10.0.1") "// no-system-llvm"))
> + #t))))))))))
> +
> ;; TODO(staging): Bump this variable to the latest packaged rust.
> (define-public rust rust-1.45)

Apologies for the duplicated work, but that's been tackled as part of
the reduced rust bootstrap that you can currently inspect in the
core-updates-frozen-batched-changes branch (to be merged into
core-updates-frozen soonish).

Closing,

Thank you!

Maxim
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 49956@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 49956
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help