From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id gEjmCpe+zGaUZQAAe85BDQ:P1 (envelope-from ) for ; Mon, 26 Aug 2024 17:42:47 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id gEjmCpe+zGaUZQAAe85BDQ (envelope-from ) for ; Mon, 26 Aug 2024 19:42:47 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=g2WKwTom; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1724694167; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=4ht2GlA/0HyfM3VwBdE+iE9jCxeNd4FZlqUHPwrS2ts=; b=Kaywah6dKh6q4+Nqc0azR/m887hzCjotSOX2MoaOae4r6/R3oTikFYBXbP4XbPG4V2O1Am Xaij3trHgS/1ZXJO8HIrt0TaVKO+tEgJNt6t4lryJ7G6YN75R2u3I85WLJMzdEiFXeFwWp XFm3BGyEy7i0pmLKT7JGLsRiVQtPm5bbsw4vQsuvXBgTTK9kyCFNPArt8ZiBstUYhWie/7 KhqPkx9wsio026MCxyZutCeptg/uD1jGPLVbd6kxjEfP0ERk36PTOohFs9qGcX36S6tfPd L+KEfwmyIpru4v9T+zGQfQ9AXUzVRjWRvy92u/V1ta6HfxEY7yP9ZVbrc+9T8Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=g2WKwTom; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1724694167; a=rsa-sha256; cv=none; b=ttdEJqqfN+7LAMGZqjhBVJxzQkCs0HlqYRlTusGhaUqaJOrBxdje+n96P+0vI3ImfWN9iD TyrGoPF8L9t2KprEs5f/uPwO0/qrB9wQjVj2B984rN8HnpLeWhJeE0bxMbIrBIVIx0QqX9 JDkHjSW7b1IEtFKfoe5wMwUb8BAGMbIKVXDCgFW6muYfki9ZQPc8oWZBEm5cP0C/RVBmNQ BcF+OS2B5sFrDKWvHv2iQceM/Cf9X7D8ucdlvRHPtReoZ/iz9t2U4K0Mfnwm8TwBigH/Ij cwL2nxdCz7QWuv4sfybeN7QJJUrj4u2gBZvmo3noq4s0kwUO7KUfcJYLgCESXg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0CFC165CFC for ; Mon, 26 Aug 2024 19:42:47 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sidjI-0006Bv-Pj; Mon, 26 Aug 2024 13:42:12 -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 1sidjH-0006Ay-Cs for guix-patches@gnu.org; Mon, 26 Aug 2024 13:42:11 -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 1sidjG-0002nD-Sh for guix-patches@gnu.org; Mon, 26 Aug 2024 13:42:10 -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:References:In-Reply-To:Date:From:To:Subject; bh=4ht2GlA/0HyfM3VwBdE+iE9jCxeNd4FZlqUHPwrS2ts=; b=g2WKwTomuANkbpMI93QzedUfrSrsaumbxDYQ3QuLQHIhk/6s00cPwoECexUqyEroBLQjDqOO6hAKVKMWf4t6gflbUCC7f9ZfO+nTEJI4JRLjvCpYDsO6DGjzI6l5/smKTVFOd9DwdcckuczGYLIyUxMJ7KdEb371wKfwVQ9mLIPd4mUNaFHYYbViN+8edAiah8WvgFSf3j37Ja5LpLcKiRdIECYXpgEvBJfnLHOnjqo9/KaDZjca0rEc6nOSGOUZbvH+Pxh5g9DsRXxNH4kVYoA6/ax203jceFnighMfaqJlmW05C9lpX6Qaku/3cyJKnb0e4cyFnyHRreOiyQ3qYw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sidk6-0004Z6-CH for guix-patches@gnu.org; Mon, 26 Aug 2024 13:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72821] [PATCH 3/4] gnu: rust: Add rust 1.80.1 Resent-From: brennan@umanwizard.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Aug 2024 17:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72821 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72821@debbugs.gnu.org Cc: Brennan Vincent , efraim@flashner.co.il Received: via spool by 72821-submit@debbugs.gnu.org id=B72821.172469413617454 (code B ref 72821); Mon, 26 Aug 2024 17:43:02 +0000 Received: (at 72821) by debbugs.gnu.org; 26 Aug 2024 17:42:16 +0000 Received: from localhost ([127.0.0.1]:45154 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sidjL-0004XS-OQ for submit@debbugs.gnu.org; Mon, 26 Aug 2024 13:42:16 -0400 Received: from smtp.umanwizard.com ([54.203.248.109]:45236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sidjJ-0004X5-SP for 72821@debbugs.gnu.org; Mon, 26 Aug 2024 13:42:14 -0400 Received: from localhost ([184.75.93.166]) by smtp.umanwizard.com ; 26 Aug 2024 17:41:15 +0000 X-Fes-Received-For: 72821@debbugs.gnu.org X-Fes-Received-From: From: brennan@umanwizard.com Date: Mon, 26 Aug 2024 13:40:56 -0400 Message-ID: <20240826174057.1285361-3-brennan@umanwizard.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240826174057.1285361-1-brennan@umanwizard.com> References: <20240826174057.1285361-1-brennan@umanwizard.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Fes-Encrypted: true X-Fes-Ehlo-Domain: localhost 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 0CFC165CFC X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -9.01 X-Spam-Score: -9.01 X-TUID: on/wdoNX2fxC From: Brennan Vincent gnu/packages/rust.scm (new variable): rust-1.80 Change-Id: Ie7dd276f7b4d606660557f3da42064b04dda1435 --- gnu/packages/rust.scm | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 403c3933d4..0d3a11b696 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1020,6 +1020,33 @@ (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.1" + "1i1dbpwnv6ak244lapsxvd26w6sbas9g4l6crc8bip2275j8y2rc"))) + (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.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) @@ -1070,9 +1097,13 @@ (define-public rust (for-each delete-file (find-files "vendor" "\\.(a|dll|exe|lib)$")) ;; Adjust vendored dependency to explicitly use rustix with libc backend. - (substitute* "vendor/tempfile/Cargo.toml" - (("features = \\[\"fs\"" all) - (string-append all ", \"use-libc\""))))))) + (for-each + (lambda (f) + (substitute* f + (("features = \\[\"fs\"" all) + (string-append all ", \"use-libc\"")))) + '("vendor/tempfile-3.10.1/Cargo.toml" + "vendor/tempfile-3.7.1/Cargo.toml")))))) (arguments (substitute-keyword-arguments (strip-keyword-arguments '(#:tests?) -- 2.45.2