From unknown Sat Jun 14 03:55:55 2025 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 Content-Type: text/plain 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-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) * 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(-) 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"))) base-commit: b54a9ca849f013300c633fb79d80bc754f6b28a2 -- 2.48.1 From unknown Sat Jun 14 03:55:55 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Brennan Vincent Subject: bug#77149: closed (Re: [PATCH] gnu: rust: Update to 1.85.) Message-ID: References: <87r02qd7k8.fsf@eugene.mail-host-address-is-not-set> X-Gnu-PR-Message: they-closed 77149 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 77149@debbugs.gnu.org Date: Tue, 25 Mar 2025 13:50:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1742910602-17688-1" This is a multi-part message in MIME format... ------------=_1742910602-17688-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #77149: [PATCH] gnu: rust: Update to 1.85. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 77149@debbugs.gnu.org. --=20 77149: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D77149 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1742910602-17688-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 77149-done) by debbugs.gnu.org; 25 Mar 2025 13:49:11 +0000 Received: from localhost ([127.0.0.1]:36961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tx4eV-0004Zp-5H for submit@debbugs.gnu.org; Tue, 25 Mar 2025 09:49:11 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:46485) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tx4eM-0004Z5-MO for 77149-done@debbugs.gnu.org; Tue, 25 Mar 2025 09:49:07 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3965c995151so2807621f8f.1 for <77149-done@debbugs.gnu.org>; Tue, 25 Mar 2025 06:49:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742910535; x=1743515335; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=ee8Evg2QKX2pYeKqjIIPwKB7oWYE0VtO8KQ/laeDw3k=; b=Y/mdIr6p3imu0JmNCsjt1c3oME+XMP5j79ZyHAAbgTT08RG9+g/c8gVfnfMvCwxXJr 43NzKwiEYTc9D+Xqt7BNzmJ19Nc/D3vSOA6/7/INEMUU1hc6n1MndBC6gyedLoMZimVA BdKxEksqoL247OYEjxTiiPAqDbir7QuPy3vXBiEPuAI++7sw8E0OwQsQBM9v6yYwOkW0 tz+6rUnwK63oU/o/wOlmCW68b7nvclxqAQo+xJAOOu3ulOGSsX9bi4sO+qLQGs0CUUpi ooJ2a93tkLublt3odFgdtk4+idbeGeISCQJezOBIwHYYNE7+I7czMh/lQad0dgVhEuuE dWEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742910535; x=1743515335; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ee8Evg2QKX2pYeKqjIIPwKB7oWYE0VtO8KQ/laeDw3k=; b=OmWa/4H8I+VWxdRCy1vcg9ZmhjTlxcOZluPrNmdles9mE9lDzzOaUHOnQy48R6MbdB qTz4GvfbA+2YQ0mMLK4xDso16f1S/jkpV7WFP0/8ZSAGmOveGMvYcHC7PXaGBWIKE92m d+tLpcsK0vLFJZYW1U0QI+pLZ75O1p+XhQS84xXKlu8Tu9NiyCMGG1aKcx1lu78CV96Y DusSKnz5CtWqE49Dj8qMx3olaz23b75DROpDcYgs1RlGhDthtEowniEtcUMn/jGVVO5v Rza7LnScaebvvfIRyLRLiWNd+NyFR5IjETY9ChK17KZvCQ45aiN103eDBuEu9l1F4JbC zTZA== X-Gm-Message-State: AOJu0YwXfbL1UgVuGQO5/kkrkuBgYbtphuWok7vJqvzI9aeCJM7kC83M fndpRxKGkyVAzJPZ21fmKrdKCqxfGbSq/3gEfrnxg54mg9aLfgv0BB5zbY5K X-Gm-Gg: ASbGnct/rjSqPzZCnoqyUVnzBlcgdAWeRgBIqNRCXK651Lvrm83yLakfo3HA9V8RDfM S3T99zm3GHdHs7a++TGsEun/oQS8AXD6PbqdxyldQia4kM56xX/vkd2DB59+O/Ke69EASXoP9xh De3b+2AFe1O+PvrJe5bKGIlgGILZKOXlkBPdtUOMUFFtl/FXv+lC2VsYkPAC/0pz3VekC9+bIaZ tT3ZNr7NirVcERT4x/mFF4eH/6OqH1y/vvjeByZ6NK/eOMM2q8o9b/C/YEJ6xOQHq9HmjDvbHj3 9SoEsETyfauiFGSVuv2QA/kIeEoUPl1F8g7qs6qUhTYR+0pkhh9ANA== X-Google-Smtp-Source: AGHT+IEVqyoToiQGC9LH7PbcJcuaA3CgDqu6BrLKXTPkmxA9KSyGTgoS0zCSqByYmYYYx+np1yBjwg== X-Received: by 2002:a05:6000:1ac9:b0:390:fbdd:994d with SMTP id ffacd0b85a97d-3997f910670mr15720740f8f.27.1742910534979; Tue, 25 Mar 2025 06:48:54 -0700 (PDT) Received: from localhost ([141.226.15.94]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3997f9b5939sm14097197f8f.60.2025.03.25.06.48.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 06:48:54 -0700 (PDT) Date: Tue, 25 Mar 2025 15:48:53 +0200 From: Efraim Flashner To: Brennan Vincent Subject: Re: [PATCH] gnu: rust: Update to 1.85. Message-ID: Mail-Followup-To: Efraim Flashner , Brennan Vincent , 77149-done@debbugs.gnu.org References: <87r02qd7k8.fsf@eugene.mail-host-address-is-not-set> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="WTXVkDTnkBGuvdEX" Content-Disposition: inline In-Reply-To: <87r02qd7k8.fsf@eugene.mail-host-address-is-not-set> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77149-done Cc: 77149-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --WTXVkDTnkBGuvdEX Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Thanks. Patch pushed! --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --WTXVkDTnkBGuvdEX Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmfitEEACgkQQarn3Mo9 g1FagA//bZUakGrhzsu2AFHPCPG6ZmN4UDn9diCNztgNfi4lnoWzJqSSFf4ZcxML ZDME/hyFpm1+4Xj09R/UXcgmG+7JhVC3YmNMjR5UDqtldk6NxC4hEO3RbCVOOsjq EAQpyeqJqNXSm6dcYOqesqKLrvx2y+FD2yhOQRcB6+AdGmEfHVvN/j8L7ptEdh34 7m32Qf7/+C1RhfkolSfaYQl9Onbt/mZYMTPS61PsU9uVa6AuqW4gQDi2gRHpKtUW NBiAGZlIfXk52ye/UDjOzHwjNo4sfLnrhvhyhzmghXl+0DTiCXUUUYAIqwYLDvxr +Uu56h9iI59xUDx33l0DS2VqqkkM0aRsDAJeeq8JvKQVFeRQiwfIm7757Hy6un8Y m5TuYG8HPb9bax8q05Ree6x+DzS8sMCfr56c9p6wLNJR4EreB4Me3nZbo+JZF3uM V4VM7VpgjEsk44EXCKUtXcKWNU20naMC9qRoPJuAVXhiCwafeV6ykpbRddldp0SZ QJFFUrSyAl57YAob56E+KVufdIzcnADVS0ElnDj1jGn55VE22Mgo9+4tcSFbXGlA gey0HscKvJCLhVXvBqCh0FvJc093szb39uqLmrioLj9inPbA0mXP66PdvxLq8/U0 zYox8tJypZC8ADPoRtYPEgIB+9CnLo5fYXUeFJyg5OmRCjKdznk= =0ksW -----END PGP SIGNATURE----- --WTXVkDTnkBGuvdEX-- ------------=_1742910602-17688-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 To: guix-patches@gnu.org, efraim@flashner.co.il Subject: [PATCH] gnu: rust: Update to 1.85. 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 Content-Type: text/plain 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-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) * 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(-) 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"))) base-commit: b54a9ca849f013300c633fb79d80bc754f6b28a2 -- 2.48.1 ------------=_1742910602-17688-1--