From patchwork Sun Feb 16 18:02:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 X-Patchwork-Id: 38753 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 2ADBE27BBE2; Sun, 16 Feb 2025 18:03:28 +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=-5.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI, PDS_OTHER_BAD_TLD,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS autolearn=ham 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 9661527BBEA for ; Sun, 16 Feb 2025 18:03:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tjiyv-0006ls-HW; Sun, 16 Feb 2025 13:03:06 -0500 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 1tjiyt-0006lV-Nz for guix-patches@gnu.org; Sun, 16 Feb 2025 13:03:03 -0500 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 1tjiyt-00028N-Eu for guix-patches@gnu.org; Sun, 16 Feb 2025 13:03:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=3BTCZzVd2icYBiHCwDEOErW9iRXo0vM1VkwvVzXRYuo=; b=iP+/8NATdf5goLNUsCGu0KP81V9mWrLo1ZnFrdui1ckf0HpT5ISaaxyRr2oHxHoMsCXaPO0cHBnIubMNcw+4tL+qakx1H+6NppCjGm6dPsjHbh7HutxncQFuwoatscd1MPTcsu2Lw8mSUuyRxO4LcH13mmbqtzi6LHr84deEe2H0VZKwKg6qdmN/YG/thZ3ozKDHd5/jMLDitRgZapXbMJsVvmJTxXWFQnYhCx0z/swV0QTSsMdRB/Ghpu8RPV4y/+7x57nOzkJOha/pcWsMfDPcmrGRJmFXGLa9jd1kghUg4e0jNHFdXLgFi71pbRUYrSsm0Q6tLuTekVY8H9Db7A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tjiys-000373-IE; Sun, 16 Feb 2025 13:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76345] [PATCH 1/2] gnu: Add rust-1.83. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: divya@subvertising.org, efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Sun, 16 Feb 2025 18:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76345 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76345@debbugs.gnu.org Cc: Divya Ranjan Pattanaik , Efraim Flashner X-Debbugs-Original-Xcc: Divya Ranjan Pattanaik , Efraim Flashner Received: via spool by 76345-submit@debbugs.gnu.org id=B76345.173972897611928 (code B ref 76345); Sun, 16 Feb 2025 18:03:02 +0000 Received: (at 76345) by debbugs.gnu.org; 16 Feb 2025 18:02:56 +0000 Received: from localhost ([127.0.0.1]:37082 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tjiyl-00036I-FH for submit@debbugs.gnu.org; Sun, 16 Feb 2025 13:02:55 -0500 Received: from mail.z572.online ([88.99.160.180]:54104) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tjiyi-00035u-KE for 76345@debbugs.gnu.org; Sun, 16 Feb 2025 13:02:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=z572.online; s=me; t=1739729291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3BTCZzVd2icYBiHCwDEOErW9iRXo0vM1VkwvVzXRYuo=; b=jPg4h9Y3grcisXQ9DxXMiBVtQKAjK3i+5HwM05krXSHiyMJQQ80Vq2hYlCY0zdIKeT1XiU NhojcX2BEvriqueLJlciJ49KXhSoZrOUPYfSsystHEnwI48qUoNFOcLQSRpRvBGfSYt/bZ p9ddmkXO1PXDNvyO4jHII6EPn2wYkDA= Received: from m.tailaa68d.ts.net (mail1.85362086.com [107.174.64.25]) by mail.z572.online (OpenSMTPD) with ESMTPSA id c963a575 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <76345@debbugs.gnu.org>; Sun, 16 Feb 2025 18:08:11 +0000 (UTC) From: Zheng Junjie Date: Mon, 17 Feb 2025 02:02:40 +0800 Message-ID: <4dceee0d5070f26488db9a0757d316e6e683bcd4.1739418344.git.z572@z572.online> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 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. Change-Id: I1cb42d71bed57fe766d7434d2aa950110eab0ed3 --- gnu/packages/rust.scm | 44 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index abaf7166fd5..d6b78209ac2 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2020 Matthew James Kraai ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 (unmatched parenthesis -;;; Copyright © 2022 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2022, 2025 Zheng Junjie ;;; Copyright © 2022 Jim Newsome ;;; Copyright © 2022 Mark H Weaver ;;; Copyright © 2023 Fries @@ -1041,6 +1041,48 @@ (define-public rust-1.82 (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) + (source + (origin + (inherit (package-source base-rust)) + (snippet + '(begin + (for-each delete-file-recursively + '("src/llvm-project" + "vendor/jemalloc-sys-0.5.3+5.3.0-patched/jemalloc" + "vendor/jemalloc-sys-0.5.4+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")) + ;; 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.13.0/Cargo.toml") + (("features = \\[\"fs\"" all) + (string-append all ", \"use-libc\""))))))) + (inputs (modify-inputs (package-inputs base-rust) + ;; Need llvm >= 18.0 + (replace "llvm" llvm-18))) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'configure 'not-download-ci-llvm + (lambda _ + (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." (map (lambda (str)