From patchwork Fri Mar 21 10:03:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brennan Vincent X-Patchwork-Id: 40557 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 2A48727BBE9; Fri, 21 Mar 2025 10:04:25 +0000 (GMT) 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_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 956A427BBE2 for ; Fri, 21 Mar 2025 10:04:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvZES-0006Oe-SM; Fri, 21 Mar 2025 06:04:04 -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 1tvZEQ-0006Ke-Vw for guix-patches@gnu.org; Fri, 21 Mar 2025 06:04:03 -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 1tvZEQ-0003V3-Mb for guix-patches@gnu.org; Fri, 21 Mar 2025 06:04:02 -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=44au0Dna/4AkdY69dq6HKyiPC24VDUKC6Ev76EyTdZU=; b=raA2pgOBao8/qFy6FAX0hiITIB0GmGcQL7TkGv5Vw3wMjIRfr9HqpnfmcDvXvztjq1JLI3JWIuQpDOQe7h/9lisr6uy2XvGCICi4WN8j5oYm8OeIdUwyiC0XKEMcTIT97RZtORUgO8yO1Q55GqBGs1+vfA4y8oyn1YOYeIHqKwX0A8UlC1PI2gVP1lzhFPl3kU7McbYVqjZ4UeNuRW/LzQPfvgeE0knQ0zphLJ3zPj+buKzNfAn9zyFymQmXexkHUrR/Vqdb2yDUi7onqIhNNIBBt4gW2rblZXp9eITufS1hvEGxpjKYcNW/AWyjukFc+KztNJUnNGY+Sw8nsAXZjg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tvZEQ-0000b7-BZ for guix-patches@gnu.org; Fri, 21 Mar 2025 06:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77149] [PATCH] gnu: rust: Update to 1.85. Resent-From: Brennan Vincent Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Mar 2025 10:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77149 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77149@debbugs.gnu.org, efraim@flashner.co.il X-Debbugs-Original-To: guix-patches@gnu.org, efraim@flashner.co.il Received: via spool by submit@debbugs.gnu.org id=B.17425514382266 (code B ref -1); Fri, 21 Mar 2025 10:04:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Mar 2025 10:03:58 +0000 Received: from localhost ([127.0.0.1]:35366 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tvZEK-0000aA-0F for submit@debbugs.gnu.org; Fri, 21 Mar 2025 06:03:57 -0400 Received: from lists.gnu.org ([2001:470:142::17]:60912) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tvZEG-0000YS-9e for submit@debbugs.gnu.org; Fri, 21 Mar 2025 06:03:54 -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 1tvZEA-0005t6-CC for guix-patches@gnu.org; Fri, 21 Mar 2025 06:03:46 -0400 Received: from smtp.umanwizard.com ([54.203.248.109]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvZE8-0002sv-CN for guix-patches@gnu.org; Fri, 21 Mar 2025 06:03:46 -0400 Received: from localhost ([79.45.52.147]) by smtp.umanwizard.com ; 21 Mar 2025 10:03:41 +0000 X-Fes-Received-For: guix-patches@gnu.org X-Fes-Received-From: From: Brennan Vincent X-Envelope-From: 35a770d2a4662e65aaca8900da30c99021d67358 Mon Sep 17 00:00:00 2001 Date: Fri, 21 Mar 2025 03:03:35 -0700 Message-ID: <87r02qd7k8.fsf@eugene.mail-host-address-is-not-set> 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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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.85): New variable. * gnu/packages/rust.scm (rust): Update to 1.85. Change-Id: Ifa7b223e478f05830d343f169c5e8b29501ade5c --- gnu/packages/rust.scm | 42 +++++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) base-commit: b54a9ca849f013300c633fb79d80bc754f6b28a2 diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index ccf28c63f8..3fd7fc3433 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1085,6 +1085,34 @@ (define-public rust-1.84 (rust-bootstrapped-package rust-1.83 "1.84.1" "0xdk3g1xq33fy4m7q6l38ba9ydxbanccyb0vczvlk998jvababsy")) +(define-public rust-1.85 + (let ((base-rust + (rust-bootstrapped-package rust-1.84 "1.85.1" + "12i3jkxrc2bbd2d423q7krwkbc39wlwkjacsimx7b61m1359aa8g"))) + (package + (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + (snippet + '(begin + (for-each delete-file-recursively + '("src/llvm-project" + "vendor/jemalloc-sys-0.3.2" + "vendor/jemalloc-sys-0.5.3+5.3.0-patched/jemalloc" + "vendor/openssl-src-111.28.2+1.1.1w/openssl" + "vendor/tikv-jemalloc-sys-0.5.4+5.3.0-patched/jemalloc" + "vendor/tikv-jemalloc-sys-0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7/jemalloc")) + ;; Remove vendored dynamically linked libraries. + ;; find . -not -type d -executable -exec file {} \+ | grep ELF + ;; Also remove the bundled (mostly Windows) libraries. + (for-each delete-file + (find-files "vendor" "\\.(a|dll|exe|lib)$")) + ;; Adjust vendored dependency to explicitly use rustix with libc backend. + (substitute* '("vendor/tempfile-3.10.1/Cargo.toml" + "vendor/tempfile-3.14.0/Cargo.toml") + (("features = \\[\"fs\"" all) + (string-append all ", \"use-libc\"")))))))))) (define (make-ignore-test-list strs) "Function to make creating a list to ignore tests a bit easier." @@ -1100,7 +1128,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.84)) + (let ((base-rust rust-1.85)) (package (inherit base-rust) (properties (append @@ -1114,19 +1142,19 @@ (define-public rust (snippet '(begin (for-each delete-file-recursively - '("src/gcc" - "src/llvm-project" + '("src/llvm-project" "vendor/jemalloc-sys-0.3.2/jemalloc" "vendor/jemalloc-sys-0.5.3+5.3.0-patched/jemalloc" - "vendor/jemalloc-sys-0.5.4+5.3.0-patched/jemalloc" + ;; "vendor/jemalloc-sys-0.5.4+5.3.0-patched/jemalloc" "vendor/openssl-src-111.17.0+1.1.1m/openssl" "vendor/openssl-src-111.28.2+1.1.1w/openssl" "vendor/tikv-jemalloc-sys-0.5.4+5.3.0-patched/jemalloc" + "vendor/tikv-jemalloc-sys-0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7/jemalloc" ;; These are referenced by the cargo output ;; 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.77+curl-8.10.1/curl" + "vendor/curl-sys-0.4.78+curl-8.11.0/curl" "vendor/libffi-sys-2.3.0/libffi" "vendor/libz-sys-1.1.3/src/zlib" "vendor/libz-sys-1.1.20/src/zlib")) @@ -1159,7 +1187,7 @@ (define-public rust '("3.3.0" "3.4.0" "3.10.1" - "3.13.0")))))) + "3.14.0")))))) (arguments (substitute-keyword-arguments (strip-keyword-arguments '(#:tests?) @@ -1292,7 +1320,7 @@ (define-public rust (substitute* "install.rs" ,@(make-ignore-test-list '("fn install_global_cargo_config"))) - (substitute* '("cargo_add/add_workspace_non_fuzzy/mod.rs" + (substitute* '("cargo_add/normalize_name_path_existing/mod.rs" "cargo_info/within_ws_with_alternative_registry/mod.rs") ,@(make-ignore-test-list '("fn case")))