From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: Matthew James Kraai <kraai@ftbfs.org>
Cc: 49956-done@debbugs.gnu.org
Subject: bug#49956: [PATCH] gnu: Add rust-1.53.
Date: Sat, 16 Oct 2021 01:42:26 -0400 [thread overview]
Message-ID: <87v91xjzjx.fsf@gmail.com> (raw)
In-Reply-To: <20210809134903.19916-1-kraai@ftbfs.org> (Matthew James Kraai's message of "Mon, 9 Aug 2021 06:49:03 -0700")
Hello,
Matthew James Kraai <kraai@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@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
prev parent reply other threads:[~2021-10-16 5:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-09 13:49 [bug#49956] [PATCH] gnu: Add rust-1.53 Matthew James Kraai
2021-10-16 5:42 ` Maxim Cournoyer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87v91xjzjx.fsf@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=49956-done@debbugs.gnu.org \
--cc=kraai@ftbfs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).