From patchwork Sun Dec 10 23:06:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaeme Sifat X-Patchwork-Id: 57505 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 C034E27BBE2; Sun, 10 Dec 2023 23:12:02 +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,FREEMAIL_FROM,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 E270527BBE9 for ; Sun, 10 Dec 2023 23:12:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rCSxg-0001cY-Sz; Sun, 10 Dec 2023 18:11:48 -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 1rCSxf-0001cG-VC for guix-patches@gnu.org; Sun, 10 Dec 2023 18:11:47 -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 1rCSxf-0004x9-Mn for guix-patches@gnu.org; Sun, 10 Dec 2023 18:11:47 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rCSxu-0000Uk-2I; Sun, 10 Dec 2023 18:12:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67757] [PATCH 17/19] gnu: Add rust-grep-0.3. Resent-From: Jaeme Sifat Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Sun, 10 Dec 2023 23:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67757 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67757@debbugs.gnu.org Cc: Jaeme Sifat , Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 67757-submit@debbugs.gnu.org id=B67757.17022498881820 (code B ref 67757); Sun, 10 Dec 2023 23:12:02 +0000 Received: (at 67757) by debbugs.gnu.org; 10 Dec 2023 23:11:28 +0000 Received: from localhost ([127.0.0.1]:52044 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rCSxL-0000TI-UY for submit@debbugs.gnu.org; Sun, 10 Dec 2023 18:11:28 -0500 Received: from mailtransmit04.runbox.com ([2a0c:5a00:149::25]:48638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rCSxK-0000Sw-1j for 67757@debbugs.gnu.org; Sun, 10 Dec 2023 18:11:26 -0500 Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com) by mailtransmit04.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1rCSwz-008tHt-LD for 67757@debbugs.gnu.org; Mon, 11 Dec 2023 00:11:05 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=runbox.com; s=selector2; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To :Message-ID:Date:Subject:Cc:To:From; bh=j3ve/UnACPni3VQdQrEoeqX79vs4xH+ATG46iP4JHMo=; b=I+Zp2e4MJY3xG3kgd6wAlJ1gHu cay7NPkYX/NP/QTjx+1t/o0jdqZRjHTNzeWl4tNvfu6EPy0GhLKYUurDhmIjAyogTmT9pGqRlzJpC 3iampTKMHxqrzyZzLr5afaYpsezJnZoHxxlOt2dJraag/WF/ZccZEmSXaXfkR4xgWtbH23Cgy5a8K N7dfsD26e08uMvzvaFfgohdOgWbcReNa3575zlS+LEZXgN3bUH/3ABhgBu8uOzEMR7e/axszz4gzJ xU/NW6/9IRM8WqUXcI5Ym/ZO6l6wWsY0DenqzkUIEZ93M51VHqkh41GDBXe3BHgfhcC3235e90mKT eSFhUW+g==; Received: from [10.9.9.72] (helo=submission01.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1rCSwu-0000cj-8Z for 67757@debbugs.gnu.org; Mon, 11 Dec 2023 00:11:00 +0100 Received: by submission01.runbox with esmtpsa [Authenticated ID (1176697)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1rCSwY-00C6y9-AM; Mon, 11 Dec 2023 00:10:38 +0100 Date: Sun, 10 Dec 2023 18:06:58 -0500 Message-ID: <50efc85bfbaf476445cc581e16cfd9afffce7992.1702248679.git.jaeme@runbox.com> 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: Jaeme Sifat X-ACL-Warn: , Jaeme Sifat via Guix-patches X-Patchwork-Original-From: Jaeme Sifat via Guix-patches via From: Jaeme Sifat 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-grep-0.3): New variable. * gnu/packages/crates-io.scm (rust-grep-0.2): Inherit from rust-grep-0.3. Change-Id: I700326d84c3fee7d364fd4e4d783b9a2cd0a5581 --- gnu/packages/crates-io.scm | 40 +++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c280e7026f..a9b41f34d7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -33600,8 +33600,37 @@ (define-public rust-greetd-ipc-0.8 ("rust-thiserror" ,rust-thiserror-1) ("rust-tokio" ,rust-tokio-1)))))) +(define-public rust-grep-0.3 + (package + (name "rust-grep") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "grep" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0fa9x7q3l5z0bg91wzw1jfpk5rmh60h8bswbsxjcp1p6q5704avf")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-grep-cli" ,rust-grep-cli-0.1) + ("rust-grep-matcher" ,rust-grep-matcher-0.1) + ("rust-grep-pcre2" ,rust-grep-pcre2-0.1) + ("rust-grep-printer" ,rust-grep-printer-0.2) + ("rust-grep-regex" ,rust-grep-regex-0.1) + ("rust-grep-searcher" ,rust-grep-searcher-0.1)) + #:cargo-development-inputs (("rust-termcolor" ,rust-termcolor-1) + ("rust-walkdir" ,rust-walkdir-2)))) + (home-page + "https://github.com/BurntSushi/ripgrep/tree/master/crates/grep") + (synopsis "Line oriented regex searching as a library") + (description + "Fast line oriented regex searching as a library.") + (license (list license:unlicense license:expat)))) + (define-public rust-grep-0.2 (package + (inherit rust-grep-0.3) (name "rust-grep") (version "0.2.8") (source @@ -33613,10 +33642,8 @@ (define-public rust-grep-0.2 (sha256 (base32 "0mw61v132ng0nbz5ygb6jvsx729772803w5bv3zs4i8baq689jsi")))) - (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-grep-cli" ,rust-grep-cli-0.1) ("rust-grep-matcher" ,rust-grep-matcher-0.1) ("rust-grep-pcre2" ,rust-grep-pcre2-0.1) @@ -33625,12 +33652,7 @@ (define-public rust-grep-0.2 ("rust-grep-searcher" ,rust-grep-searcher-0.1)) #:cargo-development-inputs (("rust-termcolor" ,rust-termcolor-1) - ("rust-walkdir" ,rust-walkdir-2)))) - (home-page "https://github.com/BurntSushi/ripgrep") - (synopsis "Line oriented regex searching as a library") - (description - "Fast line oriented regex searching as a library.") - (license (list license:unlicense license:expat)))) + ("rust-walkdir" ,rust-walkdir-2)))))) (define-public rust-grep-cli-0.1 (package