GNU bug report logs - #49956
[PATCH] gnu: Add rust-1.53.

Previous Next

Package: guix-patches;

Reported by: Matthew James Kraai <kraai <at> ftbfs.org>

Date: Mon, 9 Aug 2021 13:50:02 UTC

Severity: normal

Tags: patch

Done: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>

Bug is archived. No further changes may be made.

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

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

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#49956; Package guix-patches. (Mon, 09 Aug 2021 13:50:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Matthew James Kraai <kraai <at> ftbfs.org>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Mon, 09 Aug 2021 13:50:02 GMT) Full text and rfc822 format available.

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

From: Matthew James Kraai <kraai <at> ftbfs.org>
To: guix-patches <at> gnu.org
Cc: Matthew James Kraai <kraai <at> ftbfs.org>
Subject: [PATCH] gnu: Add rust-1.53.
Date: Mon,  9 Aug 2021 06:49:03 -0700
* 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 <at> gmail.com>
 ;;; Copyright © 2020, 2021 Jakub Kądziołka <kuba <at> kadziolka.net>
 ;;; Copyright © 2020 Pierre Langlois <pierre.langlois <at> gmx.com>
-;;; Copyright © 2020 Matthew James Kraai <kraai <at> ftbfs.org>
+;;; Copyright © 2020, 2021 Matthew James Kraai <kraai <at> 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





Reply sent to Maxim Cournoyer <maxim.cournoyer <at> gmail.com>:
You have taken responsibility. (Sat, 16 Oct 2021 05:43:02 GMT) Full text and rfc822 format available.

Notification sent to Matthew James Kraai <kraai <at> ftbfs.org>:
bug acknowledged by developer. (Sat, 16 Oct 2021 05:43:02 GMT) Full text and rfc822 format available.

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

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Matthew James Kraai <kraai <at> ftbfs.org>
Cc: 49956-done <at> debbugs.gnu.org
Subject: Re: bug#49956: [PATCH] gnu: Add rust-1.53.
Date: Sat, 16 Oct 2021 01:42:26 -0400
Hello,

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

> * 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 <at> gmail.com>
>  ;;; Copyright © 2020, 2021 Jakub Kądziołka <kuba <at> kadziolka.net>
>  ;;; Copyright © 2020 Pierre Langlois <pierre.langlois <at> gmx.com>
> -;;; Copyright © 2020 Matthew James Kraai <kraai <at> ftbfs.org>
> +;;; Copyright © 2020, 2021 Matthew James Kraai <kraai <at> 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




bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Sat, 13 Nov 2021 12:24:04 GMT) Full text and rfc822 format available.

This bug report was last modified 2 years and 136 days ago.

Previous Next


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