From 6588b1c963346e1f72a0548e07d598055c313a03 Mon Sep 17 00:00:00 2001
From: Hilton Chain <hako@ultrarare.space>
Date: Mon, 21 Apr 2025 00:33:21 +0800
Subject: [PATCH] gnu: ripgrep: Remove #:cargo-inputs.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/rust-apps.scm (ripgrep)[inputs]: Use ‘cargo-inputs’.
[arguments]: Remove #:cargo-inputs and #:cargo-development-inputs.
* gnu/packages/rust-crates.scm (lookup-cargo-inputs)[ripgrep]: New entry.

Change-Id: I06156afd7c76a02c2fc6496370b89478ffe40fdb
---
 gnu/packages/rust-apps.scm   | 15 +------
 gnu/packages/rust-crates.scm | 76 ++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index c88e06147bcede5c57b867877110a031096786e8..545138e7d1f1ff12313515c7ac6e95bf53d2e039 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -2031,19 +2031,6 @@ decompressing files and directories.")
     (build-system cargo-build-system)
     (arguments
      (list
-      #:cargo-inputs `(("rust-anyhow" ,rust-anyhow-1)
-                       ("rust-bstr" ,rust-bstr-1)
-                       ("rust-grep" ,rust-grep-0.3)
-                       ("rust-ignore" ,rust-ignore-0.4)
-                       ("rust-jemallocator" ,rust-jemallocator-0.5)
-                       ("rust-lexopt" ,rust-lexopt-0.3)
-                       ("rust-log" ,rust-log-0.4)
-                       ("rust-serde-json" ,rust-serde-json-1)
-                       ("rust-termcolor" ,rust-termcolor-1)
-                       ("rust-textwrap" ,rust-textwrap-0.16))
-      #:cargo-development-inputs `(("rust-serde" ,rust-serde-1)
-                                   ("rust-serde-derive" ,rust-serde-derive-1)
-                                   ("rust-walkdir" ,rust-walkdir-2))
       #:install-source? #f
       ;; Note: the built target 'rg' binary is required for 'install-extras
       #:phases #~(modify-phases %standard-phases
@@ -2081,7 +2068,7 @@ decompressing files and directories.")
                              (lambda _
                                (invoke rg "--generate" "complete-fish")))))))
       #:features '(list "pcre2")))
-    (inputs (list pcre2))
+    (inputs (cons pcre2 (cargo-inputs 'ripgrep)))
     (native-inputs (cons* pkg-config (if (%current-target-system)
                                          (list this-package)
                                          '())))
diff --git a/gnu/packages/rust-crates.scm b/gnu/packages/rust-crates.scm
index 52ce146c384167bfa56677cb51d631be282e39f2..67affd0bca4a27b332ec4c127c3ef2102c102525 100644
--- a/gnu/packages/rust-crates.scm
+++ b/gnu/packages/rust-crates.scm
@@ -4619,6 +4619,10 @@
   (crate-source "grep-matcher" "0.1.7"
                 "00mcjar5b6y1pwf0gjdywzgh1fnp6jl612n9qznwyfm420d198s7"))
 
+(define rust-grep-pcre2-0.1.8
+  (crate-source "grep-pcre2" "0.1.8"
+                "0imybpfr9vpwna4qw30gxp9bs9j52f5152p06ak6x1sz0dp8cvyq"))
+
 (define rust-grep-printer-0.1.7
   (crate-source "grep-printer" "0.1.7"
                 "0sjsv4v7a88arckc880ns3mbn2y2p38mpnkh9dviznj9ixbm2ig1"))
@@ -7832,8 +7836,17 @@
   (crate-source "pciid-parser" "0.6.3"
                 "0d6pliaab6xs2m1vnialy1biaw3nv6g9s0ykdrracx2a5h1p4jdd"))
 
+(define rust-pcre2-0.2.9
+  (crate-source "pcre2" "0.2.9"
+                "0avb52h3ppw6kp9ynlw988c745am9j7px2cdsm0la10qmi1mrr9v"))
+
 (define rust-pcre2-0.2.9.85b7afb rust-pcre2-utf32-0.2)
 
+(define rust-pcre2-sys-0.2.9
+  (crate-source "pcre2-sys" "0.2.9"
+                "12hxy54i8amdnmcm034hqdc7iryd20n8aqg1hw5w540vzcc5s3sm"
+                #:snippet '(delete-file-recursively "upstream")))
+
 (define rust-pcre2-sys-0.2.9.85b7afb rust-pcre2-utf32-0.2)
 
 (define rust-pcsc-2.9.0
@@ -27930,6 +27943,69 @@
                                   rust-zerofrom-derive-0.1.6
                                   rust-zerovec-0.10.4
                                   rust-zerovec-derive-0.10.3))
+                     (ripgrep =>
+                              (list rust-aho-corasick-1.1.3
+                                    rust-anyhow-1.0.98
+                                    rust-bitflags-2.9.0
+                                    rust-bstr-1.12.0
+                                    rust-cc-1.2.19
+                                    rust-cfg-if-1.0.0
+                                    rust-crossbeam-deque-0.8.6
+                                    rust-crossbeam-epoch-0.9.18
+                                    rust-crossbeam-utils-0.8.21
+                                    rust-encoding-rs-0.8.35
+                                    rust-encoding-rs-io-0.1.7
+                                    rust-getrandom-0.3.2
+                                    rust-globset-0.4.16
+                                    rust-grep-0.3.2
+                                    rust-grep-cli-0.1.11
+                                    rust-grep-matcher-0.1.7
+                                    rust-grep-pcre2-0.1.8
+                                    rust-grep-printer-0.2.2
+                                    rust-grep-regex-0.1.13
+                                    rust-grep-searcher-0.1.14
+                                    rust-ignore-0.4.23
+                                    rust-itoa-1.0.15
+                                    rust-jemalloc-sys-0.5.4+5.3.0-patched
+                                    rust-jemallocator-0.5.4
+                                    rust-jobserver-0.1.33
+                                    rust-lexopt-0.3.1
+                                    rust-libc-0.2.172
+                                    rust-log-0.4.27
+                                    rust-memchr-2.7.4
+                                    rust-memmap2-0.9.5
+                                    rust-pcre2-0.2.9
+                                    rust-pcre2-sys-0.2.9
+                                    rust-pkg-config-0.3.32
+                                    rust-proc-macro2-1.0.95
+                                    rust-quote-1.0.40
+                                    rust-r-efi-5.2.0
+                                    rust-regex-automata-0.4.9
+                                    rust-regex-syntax-0.8.5
+                                    rust-ryu-1.0.20
+                                    rust-same-file-1.0.6
+                                    rust-serde-1.0.219
+                                    rust-serde-derive-1.0.219
+                                    rust-serde-json-1.0.140
+                                    rust-shlex-1.3.0
+                                    rust-syn-2.0.100
+                                    rust-termcolor-1.4.1
+                                    rust-textwrap-0.16.2
+                                    rust-unicode-ident-1.0.18
+                                    rust-walkdir-2.5.0
+                                    rust-wasi-0.14.2+wasi-0.2.4
+                                    rust-winapi-util-0.1.9
+                                    rust-windows-sys-0.59.0
+                                    rust-windows-targets-0.52.6
+                                    rust-windows-aarch64-gnullvm-0.52.6
+                                    rust-windows-aarch64-msvc-0.52.6
+                                    rust-windows-i686-gnu-0.52.6
+                                    rust-windows-i686-gnullvm-0.52.6
+                                    rust-windows-i686-msvc-0.52.6
+                                    rust-windows-x86-64-gnu-0.52.6
+                                    rust-windows-x86-64-gnullvm-0.52.6
+                                    rust-windows-x86-64-msvc-0.52.6
+                                    rust-wit-bindgen-rt-0.39.0))
                      (rust-bindgen-cli =>
                                        (list rust-aho-corasick-1.1.3
                                         rust-annotate-snippets-0.11.5