From patchwork Mon Jan 8 01:53:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilko Meyer X-Patchwork-Id: 58495 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 D71F527BBE2; Mon, 8 Jan 2024 01:56:56 +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=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 E4A7427BBE9 for ; Mon, 8 Jan 2024 01:56:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMesW-0007X1-3L; Sun, 07 Jan 2024 20:56:36 -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 1rMesK-0007ID-6h for guix-patches@gnu.org; Sun, 07 Jan 2024 20:56:24 -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 1rMesJ-0004Zb-V3 for guix-patches@gnu.org; Sun, 07 Jan 2024 20:56:23 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMesP-0000HL-QG for guix-patches@gnu.org; Sun, 07 Jan 2024 20:56:29 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68312] [PATCH 097/156] gnu: Add rust-proc-macro-crate-2. Resent-From: Wilko Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 01:56:29 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68312 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68312@debbugs.gnu.org Cc: Wilko Meyer Received: via spool by 68312-submit@debbugs.gnu.org id=B68312.1704678959512 (code B ref 68312); Mon, 08 Jan 2024 01:56:29 +0000 Received: (at 68312) by debbugs.gnu.org; 8 Jan 2024 01:55:59 +0000 Received: from localhost ([127.0.0.1]:34411 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMerv-000085-7c for submit@debbugs.gnu.org; Sun, 07 Jan 2024 20:55:59 -0500 Received: from mail.wmeyer.eu ([95.216.196.112]:48622) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMer5-0008DG-2s for 68312@debbugs.gnu.org; Sun, 07 Jan 2024 20:55:12 -0500 From: Wilko Meyer DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wmeyer.eu; s=mail; t=1704678899; bh=VSHU61JAu1KJlV/hp4xPW3DFC6K2DxP+eY8IoT6iBEQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=V8O0fusOHuVLVk3s8oolnAMa30E7PuqrnwUuXkHPQ5CAiLlA/xEregUSi2UulhQT3 Xt/kcSgcXYoGoSh5II7YBvrnh8C244k6LPvRCssHk4R7Te/z8PFea0Hlmk1LZ2Oedr cqHJxNVwA09h6sVn35vnSGJ3G59B1qdsnVE8Xquk= Date: Mon, 8 Jan 2024 02:53:14 +0100 Message-ID: <4627e583910bb3425afa49fe9d19c3e8b615456b.1704675828.git.w@wmeyer.eu> 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: , 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-2): New variable. (rust-proc-macro-crate-1): Inherit from rust-proc-macro-crate-2. Change-Id: I873ac54abccd2c0dfa2f346349fd59bf32a2f78b --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 307edaac393..f1edc3c9c14 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -53800,8 +53800,32 @@ (define-public rust-priority-queue-1 priority of an object.") (license license:expat))) +(define-public rust-proc-macro-crate-2 + (package + (name "rust-proc-macro-crate") + (version "2.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "proc-macro-crate" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "06jbv5w6s04dbjbwq0iv7zil12ildf3w8dvvb4pqvhig4gm5zp4p")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-toml-datetime" ,rust-toml-datetime-0.6) + ("rust-toml-edit" ,rust-toml-edit-0.20)))) + (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)))) + (define-public rust-proc-macro-crate-1 (package + (inherit rust-proc-macro-crate-2) (name "rust-proc-macro-crate") (version "1.3.0") (source @@ -53811,7 +53835,6 @@ (define-public rust-proc-macro-crate-1 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0d1zq41h7aymny4p87nmz20688zr9zrrn6nmczz7l77cwj4q6qb6")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1) @@ -53819,13 +53842,7 @@ (define-public rust-proc-macro-crate-1 #:cargo-development-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) - (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-1)))))) (define-public rust-proc-macro-crate-0.1 (package