From patchwork Sat Jul 27 21:20:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean SIMARD X-Patchwork-Id: 29577 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 AD94127BBE2; Sat, 27 Jul 2024 22:21:15 +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 F10E927BBE9 for ; Sat, 27 Jul 2024 22:21:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sXoqV-0006v5-IT; Sat, 27 Jul 2024 17:20:55 -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 1sXoqT-0006ue-0s for guix-patches@gnu.org; Sat, 27 Jul 2024 17:20:53 -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 1sXoqS-0003uG-O3 for guix-patches@gnu.org; Sat, 27 Jul 2024 17:20:52 -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:From:Date:To:Subject; bh=0MdnwipW+quQv8t1w/jsoggqu9T5WcqxuDqT1rhJy34=; b=bxvdacEIHJTOsEy9mPTJjcXE0gXm0xlHwt4FhvhULsJ/SNjqihgcUzCUP2lYH6oRvbcG2XoBYKY9lKkRLJ8OvrHKPyZ+9nzISmgxRWr2Ef0+tM9FlU0FioqJlk+wkIO666Om94DNH4mxUYgSxFMa5Aq41s8f5e7+S0Fp/koxY9e8PlZi5nJnWQ9stvZeRURIQAhJBP+x/Ljb4Oa48Djc9iAlPP6Fk+gbjTErwCH/jVuOimaf4za3iSWtpoTX3J1V0f4JV3yj5OehNGTXTs3Qo0cR1WZXWAUol8MRjY4/rt3/yje978OJ6w6iB+QlF441A14Joc1Aox7LlLK9JN11Kg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sXoqc-0008K4-LI for guix-patches@gnu.org; Sat, 27 Jul 2024 17:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72327] [PATCH] gnu: Add rust-1.80. Resent-From: Jean SIMARD Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jul 2024 21:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72327 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72327@debbugs.gnu.org Cc: Jean SIMARD X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172211525231964 (code B ref -1); Sat, 27 Jul 2024 21:21:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Jul 2024 21:20:52 +0000 Received: from localhost ([127.0.0.1]:42493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sXoqR-0008JT-G7 for submit@debbugs.gnu.org; Sat, 27 Jul 2024 17:20:51 -0400 Received: from lists.gnu.org ([209.51.188.17]:58598) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sXoqP-0008JL-44 for submit@debbugs.gnu.org; Sat, 27 Jul 2024 17:20:50 -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 1sXoqD-0006rY-4L for guix-patches@gnu.org; Sat, 27 Jul 2024 17:20:38 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sXoqA-0003rK-Iw for guix-patches@gnu.org; Sat, 27 Jul 2024 17:20:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuziwo.info; s=protonmail2; t=1722115226; x=1722374426; bh=0MdnwipW+quQv8t1w/jsoggqu9T5WcqxuDqT1rhJy34=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=VMkIsYlGhXaRgqiVfzumdQXh72IqVmJbXPWeRvuADmCtV9mRI+5jp/9oKCf/qWrXz F31WcuDr6vhlRS7sUReYG6R+NOYvEnZAUagcZNZx/6eO0TOHv4+SdnJHo+B/Hoc/Qf 5w9zcCWYSH64DipctsHZlEQbXuv1804gqOjv+E8E1zQlocGBBjnSnf0oT8UEUK4gzo 1U4RBxPtb+Hj/B+Lf/9KLtJqkNGkowamSdu7wx6KfG6o3sylXQ7nrmYN3qCJVgGAdB +7Bm3GlgG1aMktGDn6NuQM6T2rUzOHWplAInNPcbc1t4Da+aBGpeBWK1ppmljD7LhW /XMH5gJvR6Pyg== Date: Sat, 27 Jul 2024 21:20:20 +0000 From: Jean SIMARD Message-ID: Feedback-ID: 30348956:user:proton X-Pm-Message-ID: 6ae0c769ea5b21ed68a45fe5caaf6de505acc0ed MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.18; envelope-from=woshilapin@tuziwo.info; helo=mail-4018.proton.ch 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_H4=0.001, RCVD_IN_MSPIKE_WL=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.80): New variable. Change-Id: I9ab121ebb83bb5fca38c5dc530ae34cd50734017 --- Last version of rust 1.80.0 have been released on the 25th of July (see https://blog.rust-lang.org/2024/07/25/Rust-1.80.0.html). I've been able to test the resulting package by building a variant of `ripgrep`, only customizing the `cargo-build-system` argument with `#:rust rust-1.80` and running `./pre-inst-env guix build --file=ripgrep.scm`. The output binary of the build, `rg` runs just fine. gnu/packages/rust.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) base-commit: 46a64c7fdd057283063aae6df058579bb07c4b6a prerequisite-patch-id: 4f98409565d53cc8795ab7f4a1618cc4224d8105 prerequisite-patch-id: 4d4336c9b775dc61815bd427718da4ba05e207df prerequisite-patch-id: 1033e26576f3c3669f8511217b73e9aaf29b6afa prerequisite-patch-id: 651aa8b2cf8b006c08abfc44a190ee3197d06e95 prerequisite-patch-id: 8f846f42eb6a122e494da39e564be336a8ab90bc prerequisite-patch-id: 0ede82ec9b487cab87b18c5631900629e9228f36 prerequisite-patch-id: 64e12c5820833a1ba2b8fce6095c03b65b7ecdd6 diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 465899fe9d..58b1dcd93a 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1013,6 +1013,34 @@ (define-public rust-1.79 (("features = \\[\"fs\"" all) (string-append all ", \"use-libc\"")))))))))) +(define-public rust-1.80 + (let ((base-rust (rust-bootstrapped-package rust-1.79 "1.80.0" + "0wnn44spsy1gnbwxn4gzbnrgkxah9nrgfxj5mqn6n3r37wcnqq3g"))) + (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.4.0/Cargo.toml" + "vendor/tempfile-3.7.1/Cargo.toml" + "vendor/tempfile-3.10.1/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." (map (lambda (str)