From patchwork Mon Jul 24 05:36:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fries X-Patchwork-Id: 52156 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 489A827BBEE; Mon, 24 Jul 2023 08:32:00 +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=-2.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT, MAILING_LIST_MULTI,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 9197527BBE2 for ; Mon, 24 Jul 2023 08:31:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNq2A-0001I3-8i; Mon, 24 Jul 2023 03:31:10 -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 1qNq25-0001GS-US for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qNq24-00070Y-Mf for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNq24-00072c-Ic for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64804] [PATCH 1/5] gnu: rust: Add rust-1.69. Resent-From: Fries Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Jul 2023 07:31:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64804 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64804@debbugs.gnu.org Cc: Fries , efraim@flashner.co.il, juli@incana.org Received: via spool by 64804-submit@debbugs.gnu.org id=B64804.169018382526941 (code B ref 64804); Mon, 24 Jul 2023 07:31:04 +0000 Received: (at 64804) by debbugs.gnu.org; 24 Jul 2023 07:30:25 +0000 Received: from localhost ([127.0.0.1]:41624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNq1Q-00070L-1A for submit@debbugs.gnu.org; Mon, 24 Jul 2023 03:30:25 -0400 Received: from mail-4318.protonmail.ch ([185.70.43.18]:11537) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNoFW-0003zM-0d for 64804@debbugs.gnu.org; Mon, 24 Jul 2023 01:36:53 -0400 Date: Mon, 24 Jul 2023 05:36:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1690177003; x=1690436203; bh=c/Yp3O/j9KmYmGHEPDqDHGFIDMuOUyoDjPiv7IMsetM=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=wHzVVzRlICXniiRJu2/3oxixVsPTBxZtVi4hQBBO6yXH20ONF0Kt3PgWPElHyVnEL YKSUKS49n/Z0Weqhujvzh5T/H7e7Hc/KywkEFA8kPsWLNssM/gwu1/mvwP1wIyNEPM pLgoKe62oyvcWzISN97YhnDYS5WSSt213fkh91raGEY5lCEVV+EtpOJRjKUQCoMKKY OIfRi4Q5uCQY3zQtkipxHLLCWH2O3Q/LyLKqceI1HpN0+trXki8yrsYWiofq8Qauv6 Le+RRXM0lkDrpKa6ISsJ62QwwwAkEMq3smXKnVIk0HUgCyUsgo5pghbaMVg4J8A24y 4gBqg9n/jdI9w== Message-ID: In-Reply-To: References: Feedback-ID: 42759890:user:proton MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 24 Jul 2023 03:30:09 -0400 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: , Reply-to: Fries X-ACL-Warn: , Fries via Guix-patches X-Patchwork-Original-From: Fries via Guix-patches via From: Fries Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/rust.scm (rust-1.69): New variable. --- gnu/packages/rust.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) base-commit: b5af0b9c016a65bf32b06a4f118c2ed48f3a80b3 diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 8e106a9927..c0738a6064 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2022 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2022 Jim Newsome ;;; Copyright © 2022 Mark H Weaver +;;; Copyright © 2023 Fries ;;; ;;; This file is part of GNU Guix. ;;; @@ -705,6 +706,24 @@ (define rust-1.68 (rust-bootstrapped-package rust-1.67 "1.68.2" "15ifyd5jj8rd979dkakp887hgmhndr68pqaqvd2hqkfdywirqcwk")) +(define rust-1.69 + (let ((base-rust + (rust-bootstrapped-package + rust-1.68 "1.69.0" "03zn7kx5bi5mdfsqfccj4h8gd6abm7spj0kjsfxwlv5dcwc9f1gv"))) + (package + (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + (snippet + '(begin + (for-each delete-file-recursively + '("src/llvm-project" + "vendor/tikv-jemalloc-sys/jemalloc")) + ;; Also remove the bundled (mostly Windows) libraries. + (for-each delete-file + (find-files "vendor" ".*\\.(a|dll|exe|lib)$"))))))))) + ;;; 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 From patchwork Mon Jul 24 05:36:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fries X-Patchwork-Id: 52158 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 1CA5727BBEA; Mon, 24 Jul 2023 08:32:09 +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=-2.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT, MAILING_LIST_MULTI,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 EFA1927BBE2 for ; Mon, 24 Jul 2023 08:32:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNq27-0001Ho-Qx; Mon, 24 Jul 2023 03:31:07 -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 1qNq26-0001GW-B0 for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qNq26-00070m-2X for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNq24-00072j-Uo for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64804] [PATCH 2/5] gnu: rust: Add rust-1.70. Resent-From: Fries Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Jul 2023 07:31:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64804 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64804@debbugs.gnu.org Cc: Fries , efraim@flashner.co.il, juli@incana.org Received: via spool by 64804-submit@debbugs.gnu.org id=B64804.169018383026952 (code B ref 64804); Mon, 24 Jul 2023 07:31:04 +0000 Received: (at 64804) by debbugs.gnu.org; 24 Jul 2023 07:30:30 +0000 Received: from localhost ([127.0.0.1]:41626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNq1R-00070U-S4 for submit@debbugs.gnu.org; Mon, 24 Jul 2023 03:30:30 -0400 Received: from mail-40132.protonmail.ch ([185.70.40.132]:28141) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNoFV-0003zL-RJ for 64804@debbugs.gnu.org; Mon, 24 Jul 2023 01:36:55 -0400 Date: Mon, 24 Jul 2023 05:36:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1690177001; x=1690436201; bh=Z5LddtNf0zmmVqhTAFUG726IDD1il1sjdTSQhVZomcs=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=Ur2Yzc6OgCNcFCKoaKTWJmo7xiNlehrzNRVgxNKsHRHDpz67OTiweErnoFaos/Bkq ji3yvC9MLm0T3we0o0UnzAiDTPqr8NGPJqrvlbfCcLu01+Ld08CbkUT7wZ399vpr4v CJiM5OEURNi7jq7GRJ0q2I8KmcTx8C3nhGoefbO1c5lJFSjwMfI6d/Ua8CbjUIk7Qn s3EPVs6n0jYjkU/aDXGrCiDxRW7iCy19PhsZ9pQjajgLhVPBIublHN3ez5cC4ad4xa mTFfI8uJX5KFDBSrFGQAEGi1CxaqUqJdsgnnYe4neJBPlNzBLyXMdIomf7QosxJlCr yHYtcUYRCWgVA== Message-ID: <7e849ca25c4cceb184058d3a897c5462896d5695.1690176958.git.fries1234@protonmail.com> In-Reply-To: References: Feedback-ID: 42759890:user:proton MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 24 Jul 2023 03:30:09 -0400 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: , Reply-to: Fries X-ACL-Warn: , Fries via Guix-patches X-Patchwork-Original-From: Fries via Guix-patches via From: Fries Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/rust.scm (rust-1.70): New variable. --- .../patches/rust-1.70-fix-rustix-build.patch | 20 +++++++++++++++++++ gnu/packages/rust.scm | 16 +++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 gnu/packages/patches/rust-1.70-fix-rustix-build.patch diff --git a/gnu/packages/patches/rust-1.70-fix-rustix-build.patch b/gnu/packages/patches/rust-1.70-fix-rustix-build.patch new file mode 100644 index 0000000000..a7e2003aff --- /dev/null +++ b/gnu/packages/patches/rust-1.70-fix-rustix-build.patch @@ -0,0 +1,20 @@ +--- a/vendor/fd-lock/Cargo.toml 2023-05-31 14:44:48.000000000 -0700 ++++ b/vendor/fd-lock/Cargo.toml 2023-07-14 21:19:34.637702319 -0700 +@@ -45,7 +45,7 @@ + + [target."cfg(unix)".dependencies.rustix] + version = "0.37.0" +-features = ["fs"] ++features = ["fs", "cc"] + + [target."cfg(windows)".dependencies.windows-sys] + version = "0.45.0" +--- a/src/bootstrap/Cargo.lock 2023-07-11 20:32:40.000000000 -0700 ++++ b/src/bootstrap/Cargo.lock 2023-07-14 22:41:53.269284713 -0700 +@@ -618,6 +618,7 @@ + dependencies = [ + "bitflags", ++ "cc", + "errno", + "io-lifetimes", + "libc", diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index c0738a6064..0b9afd3ea9 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -724,6 +724,22 @@ (define rust-1.69 (for-each delete-file (find-files "vendor" ".*\\.(a|dll|exe|lib)$"))))))))) +(define rust-1.70 + (let ((base-rust + (rust-bootstrapped-package + rust-1.69 "1.70.0" "0z6j7d0ni0rmfznv0w3mrf882m11kyh51g2bxkj40l3s1c0axgxj"))) + (package + (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + ;; Rust 1.70 adds the rustix library which depends on the vendored fd-lock + ;; crate. The fd-lock crate uses Outline assembly which expects a precompiled + ;; static library. Enabling the "cc" feature tells the build.rs script to + ;; compile the assembly files instead of searching for a precompiled library. + (patches (search-patches "rust-1.70-fix-rustix-build.patch")) + (patch-flags '("-p1"))))))) + ;;; 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 From patchwork Mon Jul 24 05:36:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fries X-Patchwork-Id: 52154 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 346EE27BBEA; Mon, 24 Jul 2023 08:31:56 +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=-2.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT, MAILING_LIST_MULTI,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 5E72527BBE9 for ; Mon, 24 Jul 2023 08:31:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNq28-0001Hy-Mo; Mon, 24 Jul 2023 03:31:09 -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 1qNq26-0001GU-7Q for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qNq25-00070i-Gt for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNq25-00072q-Dl for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64804] [PATCH 3/5] gnu: rust: Add rust-1.71. Resent-From: Fries Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Jul 2023 07:31:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64804 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64804@debbugs.gnu.org Cc: Fries , efraim@flashner.co.il, juli@incana.org Received: via spool by 64804-submit@debbugs.gnu.org id=B64804.169018383126960 (code B ref 64804); Mon, 24 Jul 2023 07:31:05 +0000 Received: (at 64804) by debbugs.gnu.org; 24 Jul 2023 07:30:31 +0000 Received: from localhost ([127.0.0.1]:41628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNq1W-00070f-2k for submit@debbugs.gnu.org; Mon, 24 Jul 2023 03:30:31 -0400 Received: from mail-4324.protonmail.ch ([185.70.43.24]:26641) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNoFf-0003ze-J2 for 64804@debbugs.gnu.org; Mon, 24 Jul 2023 01:37:00 -0400 Date: Mon, 24 Jul 2023 05:36:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1690177013; x=1690436213; bh=rxG3TdL/FvIG4xByqSFfi6yfbjBt9Yp1Sz5O4lZtXaU=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=Z0Oo7l006WhxAkZkhVcc+erlUVfFbpdTJfpk2+U5pDUsP60He+NOZ+ZsHjML2zY65 Xu+IDhYSwQyal1hhdM+c2jE/WQX/jZDuTynRDHCb44MvaBGeM8jTaVP43CJnfWgPIw NlxjPNcVkB5RJAxcPAoLq8ZMji6YIWgRW7ZwjmA5/63fq2AF2+0pB7Pnq3RIvCaR5p NLfDW29ucf4jPtbpOBkg/3wSiMjuE0NPpCyUuLQCnYWBLq/yzbkUwCKv9R/ATdHsW3 ZV5rVWEsMlAtCTQid1N78H5p0BV4Qlo7LndC3dABbh3CWfWj05r/PcrJruNIsDfXd7 UDa8T91tNspIw== Message-ID: In-Reply-To: References: Feedback-ID: 42759890:user:proton MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 24 Jul 2023 03:30:09 -0400 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: , Reply-to: Fries X-ACL-Warn: , Fries via Guix-patches X-Patchwork-Original-From: Fries via Guix-patches via From: Fries Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/rust.scm (rust-1.71): New variable. --- gnu/packages/rust.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 0b9afd3ea9..b65390c97c 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -740,6 +740,28 @@ (define rust-1.70 (patches (search-patches "rust-1.70-fix-rustix-build.patch")) (patch-flags '("-p1"))))))) +(define rust-1.71 + (let ((base-rust + (rust-bootstrapped-package + rust-1.70 "1.71.0" "15jc0d13cmrh2xvpkyyvsbwgn3w4klqiwf2wlgzfp22mvjmy8rx6"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (replace 'patch-cargo-checksums + (lambda _ + ;; Cargo's Cargo.lock file needs to have its checksums replaced so + ;; the Cargo build doesn't fail. + (substitute* '("Cargo.lock" + "src/bootstrap/Cargo.lock" + "src/tools/rust-analyzer/Cargo.lock" + "src/tools/cargo/Cargo.lock") + (("(checksum = )\".*\"" all name) + (string-append name "\"" ,%cargo-reference-hash "\""))) + (generate-all-checksums "vendor")))))))))) + ;;; 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 From patchwork Mon Jul 24 05:36:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fries X-Patchwork-Id: 52157 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 1DDAC27BBE2; Mon, 24 Jul 2023 08:32:02 +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=-2.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT, MAILING_LIST_MULTI,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 A920227BBEA for ; Mon, 24 Jul 2023 08:31:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNq27-0001Hq-Sc; Mon, 24 Jul 2023 03:31:08 -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 1qNq26-0001GV-7x for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qNq25-00070k-UH for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNq25-00072x-Qo for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64804] [PATCH 4/5] gnu: rust: Add make-ignore-test-list function. Resent-From: Fries Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Jul 2023 07:31:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64804 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64804@debbugs.gnu.org Cc: Fries , efraim@flashner.co.il, juli@incana.org Received: via spool by 64804-submit@debbugs.gnu.org id=B64804.169018383126967 (code B ref 64804); Mon, 24 Jul 2023 07:31:05 +0000 Received: (at 64804) by debbugs.gnu.org; 24 Jul 2023 07:30:31 +0000 Received: from localhost ([127.0.0.1]:41630 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNq1X-00070n-6e for submit@debbugs.gnu.org; Mon, 24 Jul 2023 03:30:31 -0400 Received: from mail-4324.protonmail.ch ([185.70.43.24]:57171) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNoFj-000405-Vy for 64804@debbugs.gnu.org; Mon, 24 Jul 2023 01:37:04 -0400 Date: Mon, 24 Jul 2023 05:36:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1690177018; x=1690436218; bh=+wKN6cflOvIEN8I+paTXhiJmiov5k2ONELGQudQ2ja8=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=iIJWkVPhtgsBm7wxxhOO2RnKlY0yHf5cg8ihwWGZLkTF7Xxy+aarf09raIHFmCZ78 +P5UAdtTryjvuxQt6s1XRrOAXOZlUQBq0yjQXPA3yco4txrpj8zGwn/ePAmhFaD6ur 3Vdi4L4vGrpSgG/e8HafvoPmWNtXDFQNK2Y7JNtjZgvmI9vHdCLR99K20V0g1Nn9DJ GHUz0wGA5Z7qG1S+ZVQkS6PqS8mljnakEOOXcuCajnT/wu6MRvMx5f96Qp0VEc9VHj AkzFEoQIkR4pkDkAvVOamyZz+IJBlmUt0HFldS6+qyAPMblEFmY3KuCejUjzyWPLJs rMcBIV84mJSIw== Message-ID: <9eb96ab85434faded1d37f78185763cd29fbb8ef.1690176958.git.fries1234@protonmail.com> In-Reply-To: References: Feedback-ID: 42759890:user:proton MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 24 Jul 2023 03:30:09 -0400 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: , Reply-to: Fries X-ACL-Warn: , Fries via Guix-patches X-Patchwork-Original-From: Fries via Guix-patches via From: Fries Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches A little helper function to make creating a list to ignore tests easier. * gnu/packages/rust.scm (make-ignore-test-list): New symbol. --- gnu/packages/rust.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index b65390c97c..03681d55ac 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -123,6 +123,12 @@ (define* (rust-bootstrapped-package base-rust version checksum) (alist-replace "rustc-bootstrap" (list base-rust) (package-native-inputs base-rust)))))) +(define (make-ignore-test-list strs) + "Function to make creating a list to ignore tests a bit easier." + (map (lambda (str) + `((,str) (string-append "#[ignore]\n" ,str))) + strs)) + ;;; Note: mrustc's only purpose is to be able to bootstap Rust; it's designed ;;; to be used in source form. (define %mrustc-commit "597593aba86fa2edbea80c6e09f0b1b2a480722d") From patchwork Mon Jul 24 05:36:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fries X-Patchwork-Id: 52155 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 6560927BBE9; Mon, 24 Jul 2023 08:31:56 +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=-2.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT, MAILING_LIST_MULTI,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 5AC8327BBE2 for ; Mon, 24 Jul 2023 08:31:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNq2B-0001IP-8b; Mon, 24 Jul 2023 03:31:11 -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 1qNq27-0001Hn-KL for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:07 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qNq26-000712-Bs for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNq26-000735-8J for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64804] [PATCH 5/5] gnu: rust: Update to 1.71. Resent-From: Fries Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Jul 2023 07:31:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64804 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64804@debbugs.gnu.org Cc: Fries , efraim@flashner.co.il, juli@incana.org Received: via spool by 64804-submit@debbugs.gnu.org id=B64804.169018384626988 (code B ref 64804); Mon, 24 Jul 2023 07:31:06 +0000 Received: (at 64804) by debbugs.gnu.org; 24 Jul 2023 07:30:46 +0000 Received: from localhost ([127.0.0.1]:41632 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNq1X-00070u-GG for submit@debbugs.gnu.org; Mon, 24 Jul 2023 03:30:46 -0400 Received: from mail-40130.protonmail.ch ([185.70.40.130]:15663) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNoFy-00041A-2a for 64804@debbugs.gnu.org; Mon, 24 Jul 2023 01:37:19 -0400 Date: Mon, 24 Jul 2023 05:36:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1690177031; x=1690436231; bh=NyadBzLjQltO+hvaTvsKKRWWKXX6f9n4Nl9A5FQ0alc=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=NOp/5Ya47h2Zsrp5q7jfuuoNdCCcOLke1kiSWPjkQRnPw5C+G8+a1QvJZB2LBWSRb cy7NFZ53+FwP/UfBO3xM8/eXlF7ft1iFBneD9a0IB6HA/XT7kFL9z8LHVnXDBWC7tu b4p2Dvw0hFc8vVCBTgNzLbbHKkgzcgIHSEm955BxGaCFGjz7aJWj1l337lVGIjEXcr FK74IncSn6WrPD60MZpEISGca06r/MEeaTnEIbMb2555pvqm1K6E3re+4I4rvRl6hz YGEXDDVzFEx3QFU9wZxKX6vCo2wOaFz/9EL6WDBpXihcu+mzQVfQI3rwO/c/Ymu0rG WQz7/O9ML9ciQ== Message-ID: <5a852a27410291cb2dda00ed3f137b3cfbbca645.1690176958.git.fries1234@protonmail.com> In-Reply-To: References: Feedback-ID: 42759890:user:proton MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 24 Jul 2023 03:30:09 -0400 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: , Reply-to: Fries X-ACL-Warn: , Fries via Guix-patches X-Patchwork-Original-From: Fries via Guix-patches via From: Fries Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/rust.scm (rust): Update to 1.71. [arguments]: Extend the disable-tests-requiring-git and disable-tests-requiring-mercurial phases to ignore more tests that will fail the build. --- gnu/packages/rust.scm | 55 +++++++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 15 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 03681d55ac..505075b9d6 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -776,7 +776,7 @@ (define rust-1.71 ;;; 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.67)) + (let ((base-rust rust-1.71)) (package (inherit base-rust) (outputs (cons "rustfmt" (package-outputs base-rust))) @@ -811,23 +811,42 @@ (define-public rust (which "env"))))) (add-after 'unpack 'disable-tests-requiring-git (lambda _ - (substitute* "src/tools/cargo/tests/testsuite/new.rs" - (("fn author_prefers_cargo") - "#[ignore]\nfn author_prefers_cargo") - (("fn finds_author_git") - "#[ignore]\nfn finds_author_git") - (("fn finds_local_author_git") - "#[ignore]\nfn finds_local_author_git")))) + (substitute* "src/tools/cargo/tests/testsuite/git.rs" + ,@(make-ignore-test-list + '("fn fetch_downloads_with_git2_first_then_with_gitoxide_and_vice_versa" + "fn git_fetch_cli_env_clean" + "fn git_with_cli_force" + "fn use_the_cli"))) + ;; Gitoxide tests require the network. + (substitute* "src/tools/cargo/tests/testsuite/git_shallow.rs" + ,@(make-ignore-test-list + '("fn gitoxide_clones_git_dependency_with_shallow_protocol_and_git2_is_used_for_followup_fetches" + "fn gitoxide_clones_registry_with_shallow_protocol_and_aborts_and_updates_again" + "fn gitoxide_clones_registry_with_shallow_protocol_and_follow_up_fetch_maintains_shallowness" + "fn gitoxide_clones_registry_with_shallow_protocol_and_follow_up_with_git2_fetch" + "fn gitoxide_clones_registry_without_shallow_protocol_and_follow_up_fetch_uses_shallowness" + "fn gitoxide_clones_shallow_two_revs_same_deps" + "fn gitoxide_git_dependencies_switch_from_branch_to_rev" + "fn gitoxide_shallow_clone_followed_by_non_shallow_update" + "fn shallow_deps_work_with_revisions_and_branches_mixed_on_same_dependency"))) + (substitute* "src/tools/cargo/tests/testsuite/offline.rs" + ,@(make-ignore-test-list '("fn gitoxide_cargo_compile_offline_with_cached_git_dep_shallow_dep"))) + (substitute* "src/tools/cargo/tests/testsuite/patch.rs" + ,@(make-ignore-test-list '("fn gitoxide_clones_shallow_old_git_patch"))))) (add-after 'unpack 'disable-tests-requiring-mercurial (lambda _ (substitute* - "src/tools/cargo/tests/testsuite/init/simple_hg_ignore_exists/mod.rs" - (("fn simple_hg_ignore_exists") - "#[ignore]\nfn simple_hg_ignore_exists")) + "src/tools/cargo/tests/testsuite/init/simple_hg_ignore_exists/mod.rs" + ,@(make-ignore-test-list '("fn case"))) (substitute* "src/tools/cargo/tests/testsuite/init/mercurial_autodetect/mod.rs" - (("fn mercurial_autodetect") - "#[ignore]\nfn mercurial_autodetect")))) + ,@(make-ignore-test-list '("fn case"))) + (substitute* + "src/tools/cargo/tests/testsuite/init/simple_hg/mod.rs" + ,@(make-ignore-test-list '("fn case"))) + (substitute* + "src/tools/cargo/tests/testsuite/new.rs" + ,@(make-ignore-test-list '("fn simple_hg"))))) (add-after 'unpack 'disable-tests-broken-on-aarch64 (lambda _ (with-directory-excursion "src/tools/cargo/tests/testsuite/" @@ -870,7 +889,7 @@ (define-public rust ;; We skip the test since it's drastically unlikely Guix's ;; packaging will introduce a bug here. (lambda _ - (delete-file "src/test/ui/parser/shebang/sneaky-attrib.rs"))) + (delete-file "tests/ui/parser/shebang/sneaky-attrib.rs"))) (add-after 'unpack 'patch-process-tests (lambda* (#:key inputs #:allow-other-keys) (let ((bash (assoc-ref inputs "bash"))) @@ -903,11 +922,17 @@ (define-public rust "gdb = \"" gdb "/bin/gdb\"\n")))))) (replace 'build ;; Phase overridden to also build rustfmt. - (lambda* (#:key parallel-build? #:allow-other-keys) + (lambda* (#:key parallel-build? outputs #:allow-other-keys) (let ((job-spec (string-append "-j" (if parallel-build? (number->string (parallel-job-count)) "1")))) + ;; Append the default output's lib folder to the RUSTFLAGS + ;; environment variable. This lets programs like rustfmt + ;; that depend on rustc's shared libraries like rustfmt work. + (setenv "RUSTFLAGS" + (format #f "-C link-arg=-Wl,-rpath,~a/lib" + (assoc-ref outputs "out"))) (invoke "./x.py" job-spec "build" "library/std" ;rustc "src/tools/cargo"