From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id aEUOCOzfcmfsHAAA62LTzQ:P1 (envelope-from ) for ; Mon, 30 Dec 2024 18:01:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id aEUOCOzfcmfsHAAA62LTzQ (envelope-from ) for ; Mon, 30 Dec 2024 19:01:16 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Gaiq0fjY; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=UOdx+ArP; 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=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1735581644; h=from:from:sender:sender:reply-to: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=frOBqdoen8uxctOUOVLoI0nJgXVqWIEa9l2m+i75Su8=; b=Hn4a5QpZpha1QbAfEJ/qhVRXNcXWCyIy+n+C05nVE5bOrBNnA5n2W4pC4bQlYBfpPE40uG pw4cNXniWms6uoEi3shn2j//2sne/5MVCyjtMgfTuRPwcmdb+KbIY5FBCXPBfzf6tXuP+Z vqSRWCtxLSOzPLGz4T1ssuOqrfx4YYi0WOKD7fu2S1iz5HkNP+I9r1n2x08lyYQNlQpjoA zO7bNX7Cgsxa7gzF9kYGOIdej3BH3PVspVeRQbIFZBYk3sK+VEvjSw/QaEQrH4ar5HgSSt 0F+cepoQiX81/gp+zozumMlPwc3vZu94ed8JL6+evgjcAen0f/NOWf6cT+9rXQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Gaiq0fjY; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=UOdx+ArP; 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=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1735581644; a=rsa-sha256; cv=none; b=Dc7/x1L2XrVRvmUDt5LmwncGsSNe21F8RHNfM2Ixahzvk2Z7sK8haK8veviHpkArBEtGf0 SdINvC3bM1uofqWZmssFlyv6ogf5uZ6Itfpkpe/fPn8ZwFIhMoxVu2GvZPLmS28VDN032j /QtXR8L9BHlLYdrGw/X7+5xOw2ekUzqsP7lilOI+yxxZ57zfMcMtOcQgyHTEgMegIH4mcc P6qmw3EsfxkMvMcPK6AL+TGD5Q/N5K7fVFr10CjNw1nFppw2p7bdDWQd1I3cF/ZfFi0T1O oJUddz6OfeSeNzmD/DtukDJeyDECY4Z4ZXDbuW86CqlE9+9XDlXVE//4n7qadw== 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 1A7C5627D0 for ; Mon, 30 Dec 2024 19:00:44 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tSK3q-0005om-FL; Mon, 30 Dec 2024 13:00:14 -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 1tSK3k-0005nl-Vd for guix-patches@gnu.org; Mon, 30 Dec 2024 13:00:09 -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 1tSK3j-0000pb-6n for guix-patches@gnu.org; Mon, 30 Dec 2024 13:00:08 -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=frOBqdoen8uxctOUOVLoI0nJgXVqWIEa9l2m+i75Su8=; b=Gaiq0fjYzWEPqd6cEeQ0wYBLeNlrhNKmWc4xBRwR3fwuYL9HFzWoqS6dMIDKKocV2CoYEtvDzHtxKrq2S2DUf3SROA0BMvkMEutFrGeEnwW2vFw6aHJpbw4hXXocMgx1Lg03nYxOxJdFXqcNKiknUR4PpFLPcN7cMkx+NwwBQpk6TFzg9xDx7QnXDv6oNHjrcM7i34E8zxkHLZitAZdkNEV4aQfpiLeF+IUJTUaNHAW85ILx5OnkVgLT+uXiB0cZ1PiooQZ0mrr2IT5C+AVX1UYi9yiNsmAY2JvLshkq5teoE/PNVyq+BiOcwKX/BKMRLcATFpjRDwgBlcnbqUHklg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tSK3j-0006x9-0M; Mon, 30 Dec 2024 13:00:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75206] [PATCH rust-team 09/10] gnu: rust-rustls-ffi-0.8: Use snippet. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Mon, 30 Dec 2024 18:00:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75206 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75206@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 75206-submit@debbugs.gnu.org id=B75206.173558155026475 (code B ref 75206); Mon, 30 Dec 2024 18:00:06 +0000 Received: (at 75206) by debbugs.gnu.org; 30 Dec 2024 17:59:10 +0000 Received: from localhost ([127.0.0.1]:59865 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSK2n-0006sr-ET for submit@debbugs.gnu.org; Mon, 30 Dec 2024 12:59:09 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:41043 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSK2X-0006qU-US for 75206@debbugs.gnu.org; Mon, 30 Dec 2024 12:58:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1735581518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=frOBqdoen8uxctOUOVLoI0nJgXVqWIEa9l2m+i75Su8=; b=UOdx+ArP1Euf3jS+z3xaKGck34dRDnmBrxBoB2yABB2krYzAr8/Nee8q5LNa7HlvPgn1Wi Eju2ZJcNdInXZ7iicHD1THUmZNc7SXtNTT0fNcU9TLopPGVGq+BMtNnkK+aOCVafQ7X99N WvDvzxUEEF2frPAFlrTI4a559nqotwLrQH3evaQ9pUi4qFd7L1HsvR1rBCGHFsB3RPYohj 49WMwqH3r5+l/UPJLH85w+BqHHKfJ0myUu0TrJH7QHCXHMWgfVA98mckWUJbOH+cy/in4G OTvXpFoeaSBl6WHQnYpdgerKSJFqFAbB8qr4BzDBCSzun9LKKBTrjMh/MvULuQ== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id dfbc3b47 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <75206@debbugs.gnu.org>; Mon, 30 Dec 2024 17:58:38 +0000 (UTC) Date: Mon, 30 Dec 2024 18:57:44 +0100 Message-ID: <63707dcb8f8bfac8305a24ac4933b351101509ab.1735580850.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee> References: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 From: Herman Rimm via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -3.00 X-Spam-Score: -3.00 X-Migadu-Queue-Id: 1A7C5627D0 X-TUID: +bOlF3JGmWm1 * gnu/packages/crates-tls.scm (rust-rustls-ffi-0.8): Add snippet. [arguments]: Remove adjust-cbindgen-requirement phase. Change-Id: Ia7434a8a6e46425e331c19a510846c78074fd46a --- gnu/packages/crates-tls.scm | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm index 36737998a9c..f66445487f8 100644 --- a/gnu/packages/crates-tls.scm +++ b/gnu/packages/crates-tls.scm @@ -1675,12 +1675,18 @@ (define-public rust-rustls-ffi-0.8 (inherit rust-rustls-ffi-0.14) (name "rust-rustls-ffi") (version "0.8.2") - (source (origin - (method url-fetch) - (uri (crate-uri "rustls-ffi" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "06kqrvm1d5ps9pml26zdd2hm8hh20j6svwvqibpnx7m5rh3jg9cx")))) + (source + (origin + (method url-fetch) + (uri (crate-uri "rustls-ffi" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "06kqrvm1d5ps9pml26zdd2hm8hh20j6svwvqibpnx7m5rh3jg9cx")) + (modules '((guix build utils))) + ;; The Cargo.toml in the git repository doesn't specify a version + ;; requirement for cbindgen. + (snippet #~(substitute* "Cargo.toml" + (("0\\.19\\.0") "*"))))) (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) @@ -1691,15 +1697,7 @@ (define-public rust-rustls-ffi-0.8 ("rust-sct" ,rust-sct-0.7) ("rust-webpki" ,rust-webpki-0.22)) #:cargo-development-inputs - (("rust-cbindgen" ,rust-cbindgen-0.26)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'adjust-cbindgen-requirement - ;; The Cargo.toml in the git repository doesn't specify - ;; a version requirement for cbindgen. - (lambda _ - (substitute* "Cargo.toml" - (("0\\.19\\.0") "*"))))))))) + (("rust-cbindgen" ,rust-cbindgen-0.26)))))) (define-public rust-rustls-native-certs-0.8 (package -- 2.45.2