From patchwork Tue Nov 1 10:24:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew James Kraai X-Patchwork-Id: 44231 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0345927BBEA; Tue, 1 Nov 2022 10:25:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 54F3D27BBE9 for ; Tue, 1 Nov 2022 10:25:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opoS9-0000Vt-R2; Tue, 01 Nov 2022 06:25:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opoS6-0000Vg-Tv for guix-patches@gnu.org; Tue, 01 Nov 2022 06:25:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opoS6-0003AE-Bi for guix-patches@gnu.org; Tue, 01 Nov 2022 06:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1opoS6-0002hI-5g for guix-patches@gnu.org; Tue, 01 Nov 2022 06:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58942] [PATCH core-updates] gnu: rust: Use rust-1.63.0 Resent-From: Matthew James Kraai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Nov 2022 10:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58942 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58942@debbugs.gnu.org Cc: Matthew James Kraai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166729829810336 (code B ref -1); Tue, 01 Nov 2022 10:25:01 +0000 Received: (at submit) by debbugs.gnu.org; 1 Nov 2022 10:24:58 +0000 Received: from localhost ([127.0.0.1]:42803 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1opoS2-0002gc-4V for submit@debbugs.gnu.org; Tue, 01 Nov 2022 06:24:58 -0400 Received: from lists.gnu.org ([209.51.188.17]:48898) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1opoS1-0002gV-0g for submit@debbugs.gnu.org; Tue, 01 Nov 2022 06:24:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opoS0-0000PO-Ri for guix-patches@gnu.org; Tue, 01 Nov 2022 06:24:56 -0400 Received: from mail.ftbfs.org ([52.8.68.13] helo=aws.ftbfs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opoRw-00031G-Sl for guix-patches@gnu.org; Tue, 01 Nov 2022 06:24:55 -0400 Received: from ip68-4-255-43.oc.oc.cox.net ([68.4.255.43] helo=carlo.lan) by aws.ftbfs.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1opoRs-000MDa-J3; Tue, 01 Nov 2022 10:24:48 +0000 From: Matthew James Kraai Date: Tue, 1 Nov 2022 03:24:44 -0700 Message-Id: <20221101102444.29755-1-kraai@ftbfs.org> X-Mailer: git-send-email 2.38.0 MIME-Version: 1.0 Received-SPF: pass client-ip=52.8.68.13; envelope-from=kraai@ftbfs.org; helo=aws.ftbfs.org X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/rust.scm (rust-1.61, rust-1.62, rust-1.63): New variables. (rust): Base on rust-1.63, add disable-tests-requiring-mercurial phase, and ignore more process tests. --- gnu/packages/rust.scm | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index d6e8795698..0f8b8cc54e 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -591,6 +591,32 @@ (define rust-1.60 ;; * error: unknown codegen option: `symbol-mangling-version` rust-1.59 "1.60.0" "1drqr0a26x1rb2w3kj0i6abhgbs3jx5qqkrcwbwdlx7n3inq5ji0")) +(define rust-1.61 + (rust-bootstrapped-package + ;; Verified that it *doesn't* build with 1.59. e.g.: + ;; * error[E0522]: definition of an unknown language item: `panic_no_unwind` + ;; * error[E0093]: unrecognized intrinsic function: `const_deallocate` + ;; * error: unrecognized platform-specific intrinsic function: `simd_as` + rust-1.60 "1.61.0" "1vfs05hkf9ilk19b2vahqn8l6k17pl9nc1ky9kgspaascx8l62xd")) + +(define rust-1.62 + (rust-bootstrapped-package + ;; Verified that it *doesn't* build with 1.60. e.g.: + ;; error: attributes starting with `rustc` are reserved for use by the `rustc` compiler + ;; error: expected `(`, found `{` + ;; error: expected one of: `*`, `+`, or `?` + rust-1.61 "1.62.1" "0gqkg34ic77dcvsz69qbdng6g3zfhl6hnhx7ha1mjkyrzipvxb3j")) + +(define rust-1.63 + (rust-bootstrapped-package + ;; Verified that it *doesn't* build with 1.61. e.g.: + ;; error: attributes starting with `rustc` are reserved for use by the `rustc` compiler + ;; error: cannot find attribute `rustc_has_incoherent_inherent_impls` in this scope + ;; error[E0522]: definition of an unknown language item: `from_yeet` + ;; error[E0093]: unrecognized intrinsic function: `ptr_offset_from_unsigned` + ;; error: unrecognized platform-specific intrinsic function: `simd_arith_offset` + rust-1.62 "1.63.0" "1l4rrbzhxv88pnfq94nbyb9m6lfnjwixma3mwjkmvvs2aqlq158z")) + ;;; Note: Only the latest versions of Rust are supported and tested. The ;;; intermediate rusts are built for bootstrapping purposes and should not ;;; be relied upon. This is to ease maintenance and reduce the time @@ -599,7 +625,7 @@ (define rust-1.60 ;;; Here we take the latest included Rust, make it public, and re-enable tests ;;; and extra components such as rustfmt. (define-public rust - (let ((base-rust rust-1.60)) + (let ((base-rust rust-1.63)) (package (inherit base-rust) (outputs (cons "rustfmt" (package-outputs base-rust))) @@ -641,6 +667,14 @@ (define-public rust "#[ignore]\nfn finds_author_git") (("fn finds_local_author_git") "#[ignore]\nfn finds_local_author_git")))) + (add-after 'unpack 'disable-tests-requiring-mercurial + (lambda _ + (substitute* "src/tools/cargo/tests/testsuite/init/mercurial_autodetect/mod.rs" + (("fn mercurial_autodetect") + "#[ignore]\nfn mercurial_autodetect")) + (substitute* "src/tools/cargo/tests/testsuite/init/simple_hg_ignore_exists/mod.rs" + (("fn simple_hg_ignore_exists") + "#[ignore]\nfn simple_hg_ignore_exists")))) (add-after 'unpack 'patch-command-exec-tests ;; This test suite includes some tests that the stdlib's ;; `Command` execution properly handles in situations where @@ -676,7 +710,11 @@ (define-public rust (("fn test_process_mask") "#[allow(unused_attributes)] #[ignore] - fn test_process_mask"))))) + fn test_process_mask") + (("fn test_process_group_no_posix_spawn") + "#[ignore]\nfn test_process_group_no_posix_spawn") + (("fn test_process_group_posix_spawn") + "#[ignore]\nfn test_process_group_posix_spawn"))))) (add-after 'unpack 'disable-interrupt-tests (lambda _ ;; This test hangs in the build container; disable it.