From patchwork Mon Sep 9 18:23:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brennan Vincent X-Patchwork-Id: 67831 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 D406727BBE2; Mon, 9 Sep 2024 19:25:27 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 61A4427BBE9 for ; Mon, 9 Sep 2024 19:25:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snj4U-0003ze-Jl; Mon, 09 Sep 2024 14: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 1snj4P-0003dy-0w for guix-patches@gnu.org; Mon, 09 Sep 2024 14:25:02 -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 1snj4N-0003Vw-RZ for guix-patches@gnu.org; Mon, 09 Sep 2024 14:25:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=kJwbNgeDdH/dL98H1ByHW6W/bgLArEn1co9phqYyYfs=; b=Xd4IqitZGJkJ8ssC0rNgHswQeHGPFOZ5S+tQeXxutgkPL2mcONuemiweLG7DJXFc6dyYDbqj/IXhgytTBDkPlv6PyRVt4mUPf8hPmOZFRrvF5PLLA6uwcv1SlMDwCbzBISnVVMXe3XO/92fVxESyzTy5vtXlEed76CYLkLPDU9uogLqxRS8Yn31zsY5BmjE/51s/uLsJbZ5Ob4OdUUlNvp2Nr/ote4LxEzLT/fx8hOw2ymzeDPDC6ry5rj7SdE4OJi1Vhsitu5Uc+/4lSUzJXaTzMcy8Brk9B/7enys/8Bq09pNZBVtzvQAdNapWO0Zlu8tkS0W2Qbl2gat4hoJNJg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snj4Q-0004w0-Lz for guix-patches@gnu.org; Mon, 09 Sep 2024 14:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73154] [PATCH] gnu: rust: update to 1.81 Resent-From: brennan@umanwizard.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Sep 2024 18:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73154 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73154@debbugs.gnu.org Cc: Brennan Vincent , efraim@flashner.co.il X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172590627118913 (code B ref -1); Mon, 09 Sep 2024 18:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Sep 2024 18:24:31 +0000 Received: from localhost ([127.0.0.1]:34119 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snj3v-0004uz-5R for submit@debbugs.gnu.org; Mon, 09 Sep 2024 14:24:31 -0400 Received: from lists.gnu.org ([209.51.188.17]:56158) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snj3s-0004uq-Ge for submit@debbugs.gnu.org; Mon, 09 Sep 2024 14:24:29 -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 1snj3o-0001Il-Ck for guix-patches@gnu.org; Mon, 09 Sep 2024 14:24:24 -0400 Received: from smtp.umanwizard.com ([54.203.248.109]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snj3j-0003U6-JS for guix-patches@gnu.org; Mon, 09 Sep 2024 14:24:24 -0400 Received: from localhost ([108.6.22.48]) by smtp.umanwizard.com ; 9 Sep 2024 18:24:16 +0000 X-Fes-Received-For: guix-patches@gnu.org X-Fes-Received-From: From: brennan@umanwizard.com Date: Mon, 9 Sep 2024 14:23:56 -0400 Message-ID: <20240909182356.2221764-1-brennan@umanwizard.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Fes-Encrypted: true X-Fes-Ehlo-Domain: localhost Received-SPF: pass client-ip=54.203.248.109; envelope-from=brennan@umanwizard.com; helo=smtp.umanwizard.com 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_PASS=-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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Brennan Vincent gnu/packages/rust.scm (new variable): rust-1.81. gnu/packages/rust.scm (rust): update to 1.81. Change-Id: Idb1958364225bebb9aa415419083b6ab97d7c4c7 --- gnu/packages/rust.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 396e8a858a..a33399d8fc 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1050,6 +1050,12 @@ (define-public rust-1.80 (("features = \\[\"fs\"" all) (string-append all ", \"use-libc\"")))))))))) +(define-public rust-1.81 + (let ((base-rust (rust-bootstrapped-package rust-1.80 "1.81.0" + "19yggj1qivdhf68gx2652cfi7nxjkdgy39wh7h6facpzppz4h947"))) + (package + (inherit base-rust)))) + (define (make-ignore-test-list strs) "Function to make creating a list to ignore tests a bit easier." (map (lambda (str) @@ -1064,7 +1070,7 @@ (define (make-ignore-test-list strs) ;;; 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.80)) + (let ((base-rust rust-1.81)) (package (inherit base-rust) (properties (append @@ -1134,7 +1140,10 @@ (define-public rust '("fn fetch_downloads_with_git2_first_"))) (substitute* "src/tools/cargo/tests/testsuite/build.rs" ,@(make-ignore-test-list - '("fn build_with_symlink_to_path_dependency_with_build_script_in_git"))))) + '("fn build_with_symlink_to_path_dependency_with_build_script_in_git"))) + (substitute* "src/tools/cargo/tests/testsuite/publish_lockfile.rs" + ,@(make-ignore-test-list + '("fn note_resolve_changes"))))) (add-after 'unpack 'disable-tests-requiring-mercurial (lambda _ (with-directory-excursion "src/tools/cargo/tests/testsuite/cargo_init" @@ -1222,7 +1231,12 @@ (define-public rust ;; string "rustc" ,@(make-ignore-test-list '("fn config_fingerprint" - "fn features_fingerprint"))))) + "fn features_fingerprint"))) + (substitute* "src/tools/cargo/tests/testsuite/git_auth.rs" + ;; This checks for a specific networking error message + ;; that's different from the one we see in the builder + ,@(make-ignore-test-list + '("fn net_err_suggests_fetch_with_cli"))))) (add-after 'unpack 'patch-command-exec-tests ;; This test suite includes some tests that the stdlib's ;; `Command` execution properly handles in situations where