From patchwork Fri Oct 21 07:59:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kiasoc5 X-Patchwork-Id: 43750 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 778BE27BBEA; Fri, 21 Oct 2022 10:42:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 E3ECD27BBE9 for ; Fri, 21 Oct 2022 10:42:46 +0100 (BST) Received: from localhost ([::1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oloY9-0006R6-4s for patchwork@mira.cbaines.net; Fri, 21 Oct 2022 05:42:45 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oln2k-0000nr-W6 for patchwork@mira.cbaines.net; Fri, 21 Oct 2022 04:06:14 -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 1oln2Y-0000eP-BZ for guix-patches@gnu.org; Fri, 21 Oct 2022 04:06:09 -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 1oln2Y-0008CK-1M for guix-patches@gnu.org; Fri, 21 Oct 2022 04:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oln2X-0000YM-Rh for guix-patches@gnu.org; Fri, 21 Oct 2022 04:06:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58679] [PATCH draft staging] gnu: Use rust-1.64.0. Resent-From: kiasoc5 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Oct 2022 08:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58679 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58679@debbugs.gnu.org Cc: kiasoc5 X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16663395412094 (code B ref -1); Fri, 21 Oct 2022 08:06:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Oct 2022 08:05:41 +0000 Received: from localhost ([127.0.0.1]:36910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oln2C-0000Xi-H2 for submit@debbugs.gnu.org; Fri, 21 Oct 2022 04:05:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:48364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oln29-0000XZ-Ia for submit@debbugs.gnu.org; Fri, 21 Oct 2022 04:05:38 -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 1oln29-0008Ka-8i for guix-patches@gnu.org; Fri, 21 Oct 2022 04:05:37 -0400 Received: from knopi.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oln26-00085r-LS for guix-patches@gnu.org; Fri, 21 Oct 2022 04:05:36 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 6DEF04E6E0; Fri, 21 Oct 2022 10:05:30 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rn3OB-SMtr9B; Fri, 21 Oct 2022 10:05:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1666339527; bh=pCjPBakbuvLT9Wg//g3NX2G7CBm9osGAS0n2oi1wWTg=; h=From:To:Cc:Subject:Date; b=ZbwoK+I97JInweg1Oy19FMfDcV5MSat456EdAnzaZZwT5rSs2vOImprBCUQg2Ixy0 L9QfCODMwDpkSQZsnu+PUklYRJT7ENK+9naykZNws9z6gQCgSEjQnpFaqnoxG9+kIe efy7xud6/24vAjqWH5stDU+Itm5/a61nPAk5BiCcn27FyQHS7R+SAb+nyeaM4QAw3G yo4zTspWG8J8yZaZexSfBi0jovb4OxUN8NTJGTYtRjNSG6t3s+auHMu8FPNbrA/+zX WaW1bup58g07H2kOgp0YErcCWzqCD7Ar2U6kVe82mazTvqpopaHDjMnIbiC5L1Plcc 9bmTnr2UWCk0Q== Date: Fri, 21 Oct 2022 03:59:21 -0400 Message-Id: <20221021075920.29771-1-kiasoc5@disroot.org> Mime-Version: 1.0 Received-SPF: pass client-ip=178.21.23.139; envelope-from=kiasoc5@disroot.org; helo=knopi.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: kiasoc5 X-ACL-Warn: , kiasoc5 via Guix-patches X-Patchwork-Original-From: kiasoc5 via Guix-patches via From: kiasoc5 X-getmail-retrieved-from-mailbox: Patches The bootstrap works up to 1.63.0. When compiling 1.64.0 there is a checksum error for vendored crates: ``` starting phase `build' Building rustbuild error: checksum for `unicode-ident v1.0.0` changed between lock files this could be indicative of a few possible errors: * the lock file is corrupt * a replacement source in use (e.g., a mirror) returned a different checksum * the source itself may be corrupt in one way or another unable to verify that `unicode-ident v1.0.0` is the same as when the lockfile was generated failed to run: /gnu/store/djw2bdjyrx5r53k1bhd5v97zhrq9zzcy-rust-1.63.0-cargo/bin/cargo build --manifest-path /tmp/guix-build-rust-1.64.0.drv-0/rustc-1.64.0-src/src/bootstrap/Cargo.toml --frozen Build completed unsuccessfully in 0:00:00 ``` The crate with bad checksum changes with every guix build, there is some nondeterminism here. * gnu/packages/rust.scm (rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust): Add rust-1.61, rust-1.62, rust-1.63, rust,-1.64, and update rust to be based on rust-1.64 instead of rust-1.60. --- gnu/packages/rust.scm | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) base-commit: 408a4ed071c9c52de207d799a698781d49fa727d diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index c4bb7d5292..aa7776c882 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -607,6 +607,38 @@ (define rust-1.60 ;; * error: unknown codegen option: `symbol-mangling-version` rust-1.59 "1.60.0" "1drqr0a26x1rb2w3kj0i6abhgbs3jx5qqkrcwbwdlx7n3inq5ji0")) +(define rust-1.61 + (let ((base-rust + (rust-bootstrapped-package + rust-1.60 "1.61.0" "1vfs05hkf9ilk19b2vahqn8l6k17pl9nc1ky9kgspaascx8l62xd"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'disable-tests-with-sigint + ;; These tests rely on killing a process with SIGINT which + ;; fails in the build container. + (lambda _ + (substitute* "library/std/src/sys/unix/process/process_common/tests.rs" + (("fn test_process_group_posix_spawn") + "#[ignore]\nfn test_process_group_posix_spawn") + (("fn test_process_group_no_posix_spawn") + "#[ignore]\nfn test_process_group_no_posix_spawn"))))))))))) + +(define rust-1.62 + (rust-bootstrapped-package + rust-1.61 "1.62.1" "0gqkg34ic77dcvsz69qbdng6g3zfhl6hnhx7ha1mjkyrzipvxb3j")) + +(define rust-1.63 + (rust-bootstrapped-package + rust-1.62 "1.63.0" "1l4rrbzhxv88pnfq94nbyb9m6lfnjwixma3mwjkmvvs2aqlq158z")) + +(define rust-1.64 + (rust-bootstrapped-package + rust-1.63 "1.64.0" "018j720b2n12slp4xk64jc6shkncd46d621qdyzh2a8s3r49zkdk")) + ;;; 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 @@ -615,7 +647,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.64)) (package (inherit base-rust) (outputs (cons "rustfmt" (package-outputs base-rust)))