From patchwork Thu Mar 14 21:16:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 61837 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 036CC27BBED; Thu, 14 Mar 2024 21:20:09 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 DBDC227BBEB for ; Thu, 14 Mar 2024 21:20:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rksTP-0006X8-9X; Thu, 14 Mar 2024 17:18:47 -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 1rksTA-0006Mv-Sa for guix-patches@gnu.org; Thu, 14 Mar 2024 17:18:33 -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 1rksT6-0004Wr-68 for guix-patches@gnu.org; Thu, 14 Mar 2024 17:18:31 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rksTg-0005BR-2F for guix-patches@gnu.org; Thu, 14 Mar 2024 17:19:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69803] [PATCH rust-team 15/37] gnu: rust-nix-0.26: Update to 0.26.4. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 14 Mar 2024 21:19:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69803@debbugs.gnu.org Cc: Herman Rimm Received: via spool by 69803-submit@debbugs.gnu.org id=B69803.171045110619708 (code B ref 69803); Thu, 14 Mar 2024 21:19:04 +0000 Received: (at 69803) by debbugs.gnu.org; 14 Mar 2024 21:18:26 +0000 Received: from localhost ([127.0.0.1]:50834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rksT3-00057i-TV for submit@debbugs.gnu.org; Thu, 14 Mar 2024 17:18:26 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:56223 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rksSe-00051Q-C6 for 69803@debbugs.gnu.org; Thu, 14 Mar 2024 17:18:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1710451026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3nO9nN4CJDEEO1hv4l8YTg3Pw98s+fNBwB3dmzS0JJ4=; b=eWnkjSwBsbUl++ygJex+2PNVDWVL19PQQO3v9QZr/w1Iqdbi19NqKXOGpG4bEV4bx90Bb0 l0Tu7/XTDt9F80m6v7jNRk3utehCHBFxr2pCGnbOlQ4TClrFvLQEUA5r3zjbtki45bI829 +M8Tpy3oqdykTvlwtxDhokMdav6uiT8PCWtPWzZyrfUbuzcone98Nv6qUXL7iUpIzJzs7h 3toQa0hMrELiD/io5ZOxyxEO2aI9JRiuczRDhzB+9D5WKYW1mnnKbQMuic/rfW4VVAs5uh aX0XFMkjj7mMbhaWzaM3H1rLHXpoRkxzXQDxcCEbmr01dCzztRe7uNMY7RWsFg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 649111a3 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 14 Mar 2024 21:17:06 +0000 (UTC) Date: Thu, 14 Mar 2024 22:16:16 +0100 Message-ID: <20240314211638.6190-15-herman@rimm.ee> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240314211638.6190-1-herman@rimm.ee> References: <20240314211638.6190-1-herman@rimm.ee> 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: , 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 * gnu/packages/crates-io.scm (rust-nix-0.26): Update. [version]: Bump from 0.26.2 to 0.26.4. [origin]: Update hash, disable panicking test with snippet. [arguments]: Build without tests, remove rust-static-assertions-1. Change-Id: I69721ba6764ae56a01123c98d68906badabc46b4 --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c37ca845a9..82727e5e74 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41202,23 +41202,36 @@ (define-public rust-nix-0.26 (package (inherit rust-nix-0.27) (name "rust-nix") - (version "0.26.2") + (version "0.26.4") (source (origin (method url-fetch) (uri (crate-uri "nix" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "06lfvjhsj5zlslsg2jhijrm69npprmsh7r1667qnl7c2jv8s7pdz")))) + (base32 "06xgl4ybb8pvjrbmc3xggbgk3kbs1j0c4c0nzdfrmpbgrkrym2sr")) + (modules '((guix build utils))) + (snippet '(substitute* + "src/sys/resource.rs" ; test panics + (("pub fn test_self_cpu_time()" all) + (string-append "#[ignore]\n" all)))))) + (build-system cargo-build-system) (arguments - (list #:skip-build? #t - #:cargo-inputs - `(("rust-bitflags" ,rust-bitflags-1) - ("rust-cfg-if" ,rust-cfg-if-1) - ("rust-libc" ,rust-libc-0.2) - ("rust-memoffset" ,rust-memoffset-0.7) - ("rust-pin-utils" ,rust-pin-utils-0.1) - ("rust-static-assertions" ,rust-static-assertions-1)))))) + `(#:tests? #f ; some tests hang + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-memoffset" ,rust-memoffset-0.7) + ("rust-pin-utils" ,rust-pin-utils-0.1)) + #:cargo-development-inputs + (("rust-assert-impl" ,rust-assert-impl-0.1) + ("rust-caps" ,rust-caps-0.5) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-rand" ,rust-rand-0.8) + ("rust-semver" ,rust-semver-1) + ("rust-sysctl" ,rust-sysctl-0.4) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-nix-0.25 (package