From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id yJJIG+kovmRdNwEASxT56A (envelope-from ) for ; Mon, 24 Jul 2023 09:31:53 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id CMsvG+kovmREhgEAauVa8A (envelope-from ) for ; Mon, 24 Jul 2023 09:31:53 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 09578685EC for ; Mon, 24 Jul 2023 09:31:53 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b="NOp/5Ya4"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1690183913; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=NyadBzLjQltO+hvaTvsKKRWWKXX6f9n4Nl9A5FQ0alc=; b=XSD5oNKSXWMWeGwzrpHw2C4XYWrBKzhmJgJ49ZOa18WsHVUyV4km0Ejo44q1IT2NR3xGjW xKxK1NQHeaf4E9W6511vj8Gr0YbrZzJqBC0X4Tulpn+ITdSXoiO41ldHmANzpHuDEkkYX8 W/5jQR3og9AjAwy2XtaOb8UWAOOrYxiQ6CnbdPR4q07exEk+tYOy+UgToYAffTSLkappZo VFicb8w/hQZrzCradSpPmnD+YCOD4TCPpA9cxV51kQC4qrO2pnE/FKNElAQB4TfWoEdfAM t4NfnTk+wv+NzNghY8fbDalZSxSPlNBkKn6Ktn8Q4xg6tQzYqMqg59YIph3PYw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b="NOp/5Ya4"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1690183913; a=rsa-sha256; cv=none; b=fkazxFdSigfi697pRUwae4BKJWgKorLzClS8v2Q3Be4MwWnVjz4Z4ftkWYWl9cq3ofHevi 3Hv48YtcBpKR9Wrtb2WoMCjGH0+/VxGtT/0J8PaLRbn81sTDrgoMpgJcK+4rGGtSL6by2L dX19GH+/2bw65e+/qVYvrf1xCKtD6XK7GnfECk8nxzZS8hzqO30Khx7pGbMbvNk6ctCx25 QQg3heZNFqhYhnB171+jgnjqJLkkRESxzWOqxgmRhZEqSOLFGpJsyLDZn95vFomNXzbjKq DKJ2Hd3iwI1l/0jw+0OZEaHmv5bGF82Fa/cS6tUFPOwhD8rhx9H8Xb+Vmz1ZyA== 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 From: Fries via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Spam-Score: -5.15 X-Migadu-Queue-Id: 09578685EC X-Migadu-Spam-Score: -5.15 X-Migadu-Scanner: mx0.migadu.com X-TUID: vg8hm+6FmnV1 * 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 t= ests ;;; 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_gito= xide_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_shallo= w.rs" + ,@(make-ignore-test-list + '("fn gitoxide_clones_git_dependency_with_shallow_pr= otocol_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_proto= col_and_follow_up_fetch_uses_shallowness" + "fn gitoxide_clones_shallow_two_revs_same_deps" + "fn gitoxide_git_dependencies_switch_from_branch_t= o_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_e= xists/mod.rs" + ,@(make-ignore-test-list '("fn case"))) (substitute* "src/tools/cargo/tests/testsuite/init/mercurial_autodet= ect/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/testsuit= e/" @@ -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 =3D \"" 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-c= ount)) "1")))) + ;; Append the default output's lib folder to the RUSTFL= AGS + ;; environment variable. This lets programs like rustfm= t + ;; that depend on rustc's shared libraries like rustfmt= work. + (setenv "RUSTFLAGS" + (format #f "-C link-arg=3D-Wl,-rpath,~a/lib" + (assoc-ref outputs "out"))) (invoke "./x.py" job-spec "build" "library/std" ;rustc "src/tools/cargo" --=20 2.41.0