From patchwork Tue Jun 24 18:35:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayan Das X-Patchwork-Id: 43225 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 081B127BC4A; Tue, 24 Jun 2025 19:36:30 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, 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 25E2627BC49 for ; Tue, 24 Jun 2025 19:36:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uU8V9-0000Go-34; Tue, 24 Jun 2025 14:36: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 1uU8V6-0000GL-IQ for guix-patches@gnu.org; Tue, 24 Jun 2025 14:36:08 -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 1uU8V6-0000ij-9x for guix-patches@gnu.org; Tue, 24 Jun 2025 14:36:08 -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=jjeDkKKZFRnr0f9GFBCbf6uMKMMhcXxe5aOHAEppVZg=; b=Wx0iO+VAQg/kLPbfurTnZF/mdiiKHwdnyM0ilU+EcDarBUku3Ek0HCCwt2OFCtiT7BzRtHR93vLzSmKoJpN0ZSrlQeqse5fwHrN01O+N0r0BAGrGP4ftr2w7J2i7aKfCcGen4qNnG1zhhrDlgePjpeXLgZzgsCa+qp+w4FwRaOttfFnTPtwmTSgOhrKWDej1tcImz8bVMplrE6f5xXDU6NCtyDZMhMK/DVsFQT+3+VRddRlMSYGxl16eHZdiirY2RD7eD+lcTJ4uG5UUYX7TDR4ky/NdhD4zo/3fiNuho7BiAOPFvCRLjgHQ8goYGWrFUggAyCgCLJEYr/oXsXAoDg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uU8V0-0000tY-E1; Tue, 24 Jun 2025 14:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78893] [PATCH 1/1] gnu: rust: Update to 1.83. Resent-From: Ayan Das Original-Sender: "Debbugs-submit" Resent-CC: divya@subvertising.org, efraim@flashner.co.il, hako@ultrarare.space, steve@futurile.net, guix-patches@gnu.org Resent-Date: Tue, 24 Jun 2025 18:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78893 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78893@debbugs.gnu.org Cc: Divya Ranjan Pattanaik , Efraim Flashner , Hilton Chain , Steve George X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Divya Ranjan Pattanaik , Efraim Flashner , Hilton Chain , Steve George Received: via spool by submit@debbugs.gnu.org id=B.17507901553419 (code B ref -1); Tue, 24 Jun 2025 18:36:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Jun 2025 18:35:55 +0000 Received: from localhost ([127.0.0.1]:48431 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uU8Ut-0000t2-3B for submit@debbugs.gnu.org; Tue, 24 Jun 2025 14:35:55 -0400 Received: from lists.gnu.org ([2001:470:142::17]:33204) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uU8Un-0000ra-57 for submit@debbugs.gnu.org; Tue, 24 Jun 2025 14:35:52 -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 1uU8Uh-0000Es-CK for guix-patches@gnu.org; Tue, 24 Jun 2025 14:35:43 -0400 Received: from mx0.riseup.net ([198.252.153.6]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uU8Uc-0000h6-Qk for guix-patches@gnu.org; Tue, 24 Jun 2025 14:35:43 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx0.riseup.net (Postfix) with ESMTPS id 4bRYY45prLz9wHj for ; Tue, 24 Jun 2025 18:35:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1750790136; bh=f8WAbshlvpx2BxJc3262MQcdcSZgpKLIisZEU2kdkf0=; h=From:To:Subject:Date:From; b=s4RM1neIITHONBMiGtK95egzZOceKrAHhysnLnvehSje9QwaavefKq7I4cIDvD/b5 NecYQzRtb3kCzdk0mcmG9rUd5UO5gJujp4+5PTQtAsOCtwMtswh/vQb9fwb8XKnloB 7nAqMGCFnYLA3b60AaMOYxTAZMueH9E7nIrRHptU= X-Riseup-User-ID: 4AE04F5458715D10126733CF40789B7D8F89B1EFF3628B3159A4C56014299864 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4bRYY36YCNzFx5R for ; Tue, 24 Jun 2025 18:35:35 +0000 (UTC) From: Ayan Das Date: Wed, 25 Jun 2025 00:05:04 +0530 Message-ID: <26406d93519b90b0e4a9f51596b24574606146af.1750787170.git.bvits@riseup.net> MIME-Version: 1.0 Received-SPF: pass client-ip=198.252.153.6; envelope-from=bvits@riseup.net; helo=mx0.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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 * gnu/packages/rust.scm (rust-1.83): New variable. * gnu/packages/rust.scm (rust): Update to 1.83. [inputs]: Replace llvm with llvm-18. [arguments]: Add 'disable-download-ci-llvm phase. [source]: Update snippet for newer vendored dependencies. [arguments]: Disable more tests in the 'disable-tests-requiring-crates.io phase. Signed-off-by: Ayan Das --- gnu/packages/rust.scm | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index abaf7166fd..c108fac9f7 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1040,6 +1040,25 @@ (define-public rust-1.82 (string-append name "\"" ,%cargo-reference-hash "\""))) (generate-all-checksums "vendor")))))))))) +(define-public rust-1.83 + (let ((base-rust (rust-bootstrapped-package rust-1.82 "1.83.0" + "0vhwhk4cbyppnz0lcazfjyddyz811fgvadfxswldicpashxpfbbj"))) + (package + (inherit base-rust) + ;; Need llvm >= 18.0 + (inputs (modify-inputs (package-inputs base-rust) + (replace "llvm" llvm-18))) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'configure 'disable-download-ci-llvm + (lambda _ + ;; Rust 1.83.0 introduced a check that prevents setting + ;; llvm-config when download-ci-llvm is enabled. + (substitute* "config.toml" + (("\\[llvm\\]") + "[llvm]\ndownload-ci-llvm = false"))))))))))) (define (make-ignore-test-list strs) "Function to make creating a list to ignore tests a bit easier." @@ -1055,7 +1074,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.82)) + (let ((base-rust rust-1.83)) (package (inherit base-rust) (properties (append @@ -1078,10 +1097,15 @@ (define-public rust ;; so we unbundle them. "vendor/curl-sys-0.4.52+curl-7.81.0/curl" "vendor/curl-sys-0.4.74+curl-8.9.0/curl" + "vendor/curl-sys-0.4.76+curl-8.10.1/curl" "vendor/libffi-sys-2.3.0/libffi" "vendor/libz-sys-1.1.3/src/zlib" "vendor/libz-sys-1.1.18/src/zlib" - "vendor/libz-sys-1.1.19/src/zlib")) + "vendor/libz-sys-1.1.20/src/zlib" + "vendor/lzma-sys-0.1.20/xz-5.2")) + ;; Force lzma-sys to use system library instead of bundled xz. + (substitute* "vendor/lzma-sys-0.1.20/build.rs" + (("!want_static && ") "")) ;; Use the packaged nghttp2 (for-each (lambda (ver) @@ -1110,9 +1134,8 @@ (define-public rust (string-append all ", \"use-libc\""))))) '("3.3.0" "3.4.0" - "3.7.1" "3.10.1" - "3.12.0")))))) + "3.13.0")))))) (arguments (substitute-keyword-arguments (strip-keyword-arguments '(#:tests?) @@ -1159,6 +1182,7 @@ (define-public rust '("fn warn_for_unused_fields"))) (substitute* '("cargo_add/locked_unchanged/mod.rs" "cargo_add/lockfile_updated/mod.rs" + "cargo_add/add_workspace_non_fuzzy/mod.rs" "cargo_remove/update_lock_file/mod.rs") ,@(make-ignore-test-list '("fn case")))