From patchwork Sun Oct 15 15:33:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: herman_rimm X-Patchwork-Id: 54846 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 79CD827BBE9; Sun, 15 Oct 2023 19:49:22 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,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 819DF27BBE2 for ; Sun, 15 Oct 2023 19:49:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qs6AY-0008VP-MZ; Sun, 15 Oct 2023 14:48: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 1qs3s3-0002xJ-07 for guix-patches@gnu.org; Sun, 15 Oct 2023 12:21:39 -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 1qs3s2-0004gU-Km for guix-patches@gnu.org; Sun, 15 Oct 2023 12:21:38 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qs3sQ-0003rO-31 for guix-patches@gnu.org; Sun, 15 Oct 2023 12:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66564] [PATCH rust-team] gnu: Add rust-1.73. Resent-From: herman_rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Oct 2023 16:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66564 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66564@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.169738689014777 (code B ref -1); Sun, 15 Oct 2023 16:22:01 +0000 Received: (at submit) by debbugs.gnu.org; 15 Oct 2023 16:21:30 +0000 Received: from localhost ([127.0.0.1]:54005 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qs3rr-0003qD-FJ for submit@debbugs.gnu.org; Sun, 15 Oct 2023 12:21:30 -0400 Received: from lists.gnu.org ([2001:470:142::17]:58620) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qs38J-000210-4k for submit@debbugs.gnu.org; Sun, 15 Oct 2023 11:34:26 -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 1qs37p-0002NZ-0l for guix-patches@gnu.org; Sun, 15 Oct 2023 11:33:53 -0400 Received: from mail-0301.mail-europe.com ([188.165.51.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qs37m-0005f2-4r for guix-patches@gnu.org; Sun, 15 Oct 2023 11:33:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1697384024; x=1697643224; bh=razLI1e9nXS5g+87QWVHjIC7mH8Lr5E87wPLTNI5hr0=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=fQDT7MgBDq9CqLmqz7yI5n9FFn83WxCjrHkek8nJOIHnerpRhv5zG++71gRFcnesH LtIvzVftJ9M1muUNce9cd5UWGLhn0+Sb/niopf1XzTbx8ykPmNjVgvYBKPLLmMZD0o s/srbCxFmCxYqWwnbgjVvN7SqtmPD/PTryl/J6marcYaLeCa9M2DGFOzNAOvGGLDuf 9oOSCZue4X/uPM8YAKPJTepMbiqpT+j8q4vH2HBAD5QRZoHBCUXSOIknS5IURCBwyI T0ydCh16uxTW496jCRD9DkwPqxSP78V9BOjB1KKejYxm19u69GGZ1xg9p30RaYblin l6Tw1mfNtbXfg== Date: Sun, 15 Oct 2023 15:33:24 +0000 Message-ID: Feedback-ID: 41267498:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=188.165.51.139; envelope-from=herman_rimm@protonmail.com; helo=mail-0301.mail-europe.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sun, 15 Oct 2023 12:21:26 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sun, 15 Oct 2023 14:48:52 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: herman_rimm X-ACL-Warn: , herman_rimm via Guix-patches X-Patchwork-Original-From: herman_rimm via Guix-patches via From: herman_rimm 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 From e9807f12b18ae7405fb63002d4f3f7b5b500b6f7 Mon Sep 17 00:00:00 2001 From: Herman Rimm Date: Sun, 15 Oct 2023 15:10:26 +0200 Subject: [PATCH rust-team] gnu: Add rust-1.73. * gnu/packages/rust.scm (rust-1.73): New variable. --- gnu/packages/rust.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 5d81655423..b50d2fdf24 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2022 Jim Newsome ;;; Copyright © 2022 Mark H Weaver ;;; Copyright © 2023 Fries +;;; Copyright © 2023 Herman Rimm ;;; ;;; This file is part of GNU Guix. ;;; @@ -787,6 +788,28 @@ (define rust-1.72 (string-append "rustix = { version = \"=0.37.11\"," " features = [\"use-libc\"] }")))))))))) +(define rust-1.73 + (let ((base-rust (rust-bootstrapped-package rust-1.72 "1.73.0" + "0fmvn7vg3qg9xprgfwv10g3ygy8i4j4bkcxcr1xdy89d3xnjxmln"))) + (package + (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + (snippet '(begin + (for-each delete-file-recursively + '("src/llvm-project" + "vendor/tikv-jemalloc-sys/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.6.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." (map (lambda (str)