From patchwork Tue Jan 30 15:25:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 59601 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 783D727BBE2; Tue, 30 Jan 2024 15:28:34 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 7CFBD27BBE9 for ; Tue, 30 Jan 2024 15:28:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rUq25-0003qF-Do; Tue, 30 Jan 2024 10:28:19 -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 1rUq1o-0003VK-Bm for guix-patches@gnu.org; Tue, 30 Jan 2024 10:28:00 -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 1rUq1o-0006TT-2f for guix-patches@gnu.org; Tue, 30 Jan 2024 10:28:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rUq1x-0007m4-01; Tue, 30 Jan 2024 10:28:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68819] [PATCH 22/49] gnu: Add rust-proc-macro-crate-3. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Tue, 30 Jan 2024 15:28:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68819 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68819@debbugs.gnu.org Cc: Herman Rimm , Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 68819-submit@debbugs.gnu.org id=B68819.170662846129658 (code B ref 68819); Tue, 30 Jan 2024 15:28:08 +0000 Received: (at 68819) by debbugs.gnu.org; 30 Jan 2024 15:27:41 +0000 Received: from localhost ([127.0.0.1]:36272 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUq1U-0007iD-Sm for submit@debbugs.gnu.org; Tue, 30 Jan 2024 10:27:41 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:60787 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUq0M-0007aI-6g for 68819@debbugs.gnu.org; Tue, 30 Jan 2024 10:26:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1706628375; 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=ZceQehtgjUtTASjJKPt01USamEoUbgo13sucOMI0z2Y=; b=aSxoSGJ8bkfHXDlL0+9YK+mfcTzTeoLtlHfCBLIFtA+O8RcccucsUfsa5Kv9HJRnDt+KBT MWk2nB4nfVAh2rOYJrreBXzhC96yBzIjGMWsrjQTqANFq/lTRQ0WhXmtb9tgUBfh/HTjrk MFc8uZmtY44ieOrgi/dfikRtj92B+z7IyuANXA74vNeaaVTMvp4uIHgaQOeZN1hkQratJV 0eSOPu9zF1PSxtkyGAB2iCwHR+6OCMxG6+wnIB7KlrVxyb6dmAEGtM1C0ciPMYx+tylwbj Ks5+ifl+oo2WuRVVs4/ftqLBkJ2TuSWhsPWnuulFVegNL69tj9dUwMYavbsR4Q== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id f365143c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 30 Jan 2024 15:26:15 +0000 (UTC) Date: Tue, 30 Jan 2024 16:25:05 +0100 Message-ID: <7d18fa6aba2eaad45f56267ef2c55958e164898b.1706619962.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-proc-macro-crate-3): Add variable. (rust-proc-macro-crate-2): Inherit from rust-proc-macro-crate-3. Change-Id: I69be44ed31c083c3a78c7f41f691b9b435b665f7 --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 792fe103f3..b840aecfd6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -47767,8 +47767,35 @@ (define-public rust-priority-queue-1 priority of an object.") (license license:expat))) +(define-public rust-proc-macro-crate-3 + (package + (name "rust-proc-macro-crate") + (version "3.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "proc-macro-crate" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "110jcl9vnj92ihbhjqmkp19m8rzxc14a7i60knlmv99qlwfcadvd")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-toml-edit" ,rust-toml-edit-0.21)) + #:cargo-development-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))) + (home-page "https://github.com/bkchr/proc-macro-crate") + (synopsis "Get the name of a (renamed) crate in @file{Cargo.toml}") + (description + "This crate provides a way to get the name of a crate, even if it +is renamed in @file{Cargo.toml}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-proc-macro-crate-2 (package + (inherit rust-proc-macro-crate-3) (name "rust-proc-macro-crate") (version "2.0.1") (source @@ -47783,7 +47810,6 @@ (define-public rust-proc-macro-crate-2 '(begin (substitute* "Cargo.toml" (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) (string-append "\"^" version))))))) - (build-system cargo-build-system) (arguments `(#:cargo-test-flags '("--release" "--" ;; Not all files included. @@ -47792,13 +47818,7 @@ (define-public rust-proc-macro-crate-2 ("rust-toml-edit" ,rust-toml-edit-0.20)) #:cargo-development-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-2)))) - (home-page "https://github.com/bkchr/proc-macro-crate") - (synopsis "Support for @code{$crate} in procedural macros") - (description - "This crate provides a way to get the name of a crate, even if it -renamed in @file{Cargo.toml}.") - (license (list license:asl2.0 license:expat)))) + ("rust-syn" ,rust-syn-2)))))) (define-public rust-proc-macro-crate-1 (package