[bug#67757] [PATCH 00/19 rust-team] gnu: rust-apps: Update ripgrep to 14.0.3

[bug#67757] [PATCH 00/19 rust-team] gnu: rust-apps: Update ripgrep to 14.0.3

[Jaeme Sifat via Guix-patches via]

This patch-set updates ripgrep to its next major release. The major change
besides the version bump on the affected packages is the method to generate
extra files being from the built binary rather than in the source code itself.

Jaeme Sifat (19):
  gnu: rust-crossbeam-channel-0.5: Update to 0.5.8.
  gnu: rust-aho-corasick-1: Update to 1.1.2.
  gnu: rust-bstr-1: Update to 1.8.0.
  gnu: rust-globset-0.4: Update to 0.4.14.
  gnu: rust-serde-1: Update to 1.0.193.
  gnu: rust-grep-matcher-0.1: Update to 0.1.7.
  gnu: rust-grep-regex-0.1: Update to 0.1.12.
  gnu: rust-ignore-0.4: Update to 0.4.21.
  gnu: Add rust-memmap2-0.9.
  gnu: rust-grep-searcher-0.1: Update to 0.1.13.
  gnu: Add rust-grep-printer-0.2.
  gnu: rust-pcre2-sys-0.2: Update to 0.2.7.
  gnu: rust-pcre2-0.2: Update to 0.2.6.
  gnu: rust-grep-pcre2-0.1: Update to 0.1.7.
  gnu: rust-winapi-util-0.1: Update to 0.1.6.
  gnu: rust-grep-cli-0.1: Update to 0.1.10.
  gnu: Add rust-grep-0.3.
  gnu: rust-termcolor-1: Update to 1.4.0.
  gnu: ripgrep: Update to 14.0.3.

 gnu/packages/crates-io.scm | 307 ++++++++++++++++++++++---------------
 gnu/packages/rust-apps.scm | 107 +++++++------
 2 files changed, 241 insertions(+), 173 deletions(-)


base-commit: 34eaf5714efcb847c9cba03a055a17e790c1d017
--
2.41.0

[bug#67757] [PATCH 01/19] gnu: rust-crossbeam-channel-0.5: Update to 0.5.8.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-crossbeam-channel-0.5): Update to 0.5.8.

Change-Id: Id8b02693056bf12a314c458cd01d3807d792100e
---
 gnu/packages/crates-io.scm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 30bc4746de..414c4c3537 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -17585,20 +17585,23 @@ (define-public rust-crossbeam-0.7
 (define-public rust-crossbeam-channel-0.5
   (package
     (name "rust-crossbeam-channel")
-    (version "0.5.6")
+    (version "0.5.8")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "crossbeam-channel" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "08f5f043rljl82a06d1inda6nl2b030s7yfqp31ps8w8mzfh9pf2"))))
+        (base32 "004jz4wxp9k26z657i7rsh9s7586dklx2c5aqf1n3w1dgzvjng53"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-cfg-if" ,rust-cfg-if-1)
-        ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8))))
+     `(#:cargo-test-flags
+       (list "--release" "--" "--skip=select2::main")
+       #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8))
+       #:cargo-development-inputs (("rust-num-cpus" ,rust-num-cpus-1)
+                                   ("rust-rand" ,rust-rand-0.8)
+                                   ("rust-signal-hook" ,rust-signal-hook-0.3))))
     (home-page
      "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-channel")
     (synopsis "Multi-producer multi-consumer channels for message passing")
-- 
2.41.0

[bug#67757] [PATCH 02/19] gnu: rust-aho-corasick-1: Update to 1.1.2.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-aho-corasick-1): Update to 1.1.2.

Change-Id: I2518e50586c5cca26cbed2ece68943357535df47
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 414c4c3537..d8f92e384a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2762,14 +2762,14 @@ (define-public rust-ahash-0.2
 (define-public rust-aho-corasick-1
   (package
     (name "rust-aho-corasick")
-    (version "1.0.2")
+    (version "1.1.2")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "aho-corasick" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0has59a3571irggpk5z8c0lpnx8kdx12qf4g2x0560i2y8dwpxj3"))))
+                "1w510wnixvlgimkx1zjbvlxh6xps2vjgfqgwf5a6adlbjp5rv5mj"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#67757] [PATCH 03/19] gnu: rust-bstr-1: Update to 1.8.0.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-bstr-1): Update to 1.8.0.

Change-Id: Ib8e6f53fd3d46059a89bddd783638a8cd2a6205b
---
 gnu/packages/crates-io.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d8f92e384a..d01e76cb10 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -9884,19 +9884,19 @@ (define-public rust-bson-2
 (define-public rust-bstr-1
   (package
     (name "rust-bstr")
-    (version "1.6.0")
+    (version "1.8.0")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "bstr" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "01bvsr3x9n75klbwxym0zf939vzim0plsmy786p0zzzvrj6i9637"))))
+                "0313sqdf0a40vhpnrlkf54zhr76rmlyxzhx00sq8822shfl36bsl"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-memchr" ,rust-memchr-2)
-        ("rust-regex-automata" ,rust-regex-automata-0.3)
+        ("rust-regex-automata" ,rust-regex-automata-0.4)
         ("rust-serde" ,rust-serde-1))
        #:cargo-development-inputs
        (("rust-quickcheck" ,rust-quickcheck-1)
-- 
2.41.0

[bug#67757] [PATCH 04/19] gnu: rust-globset-0.4: Update to 0.4.14.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-globset-0.4): Update to 0.4.14.

Change-Id: Icc93772bf2917d893b7e51720a61f8cfe1ee8c04
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d01e76cb10..acc6c8897f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33362,7 +33362,7 @@ (define-public rust-glob-0.2
 (define-public rust-globset-0.4
   (package
     (name "rust-globset")
-    (version "0.4.12")
+    (version "0.4.14")
     (source
      (origin
        (method url-fetch)
@@ -33370,7 +33370,7 @@ (define-public rust-globset-0.4
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "01phmxrkr9d7lhh84b6nylgjb3r21ssfddxvm23ihz3hw3cbpa5c"))))
+        (base32 "1qab0c1drpybgm4nc92lf8b46x0ap44c9y4k23rndgc5bfdkpnjp"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#67757] [PATCH 05/19] gnu: rust-serde-1: Update to 1.0.193.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-serde-1): Update to 1.0.193.
* gnu/packages/crates-io.scm (rust-serde-derive-1): Update to 1.0.193.
[source]: Update crate-uri.

Change-Id: I30ba68def7b4d0e18dc1028c1c6963aceaaaad13
---
 gnu/packages/crates-io.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index acc6c8897f..f5760209a0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68287,7 +68287,7 @@ (define-public rust-seq-macro-0.2
 (define-public rust-serde-1
   (package
     (name "rust-serde")
-    (version "1.0.188")
+    (version "1.0.193")
     (source
      (origin
        (method url-fetch)
@@ -68295,7 +68295,7 @@ (define-public rust-serde-1
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "17jlqzfhimsk8w37ifjwnm86nwjzawlbgwmwc7nhwdwslv5hz7ng"))))
+         "129b0j67594f8qg5cbyi3nyk31y97wrqihi026mba34dwrsrkp95"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -68704,15 +68704,15 @@ (define-public rust-serdeconv-0.4
 (define-public rust-serde-derive-1
   (package
     (name "rust-serde-derive")
-    (version "1.0.188")
+    (version "1.0.193")
     (source
      (origin
        (method url-fetch)
-       (uri (crate-uri "serde-derive" version))
+       (uri (crate-uri "serde_derive" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1wjaclvsfxgqnnnykllvb5gffsxynk66x6h4c1ds6anq8b37mjjf"))))
+         "1lwlx2k7wxr1v160kpyqjfabs37gm1yxqg65383rnyrm06jnqms3"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#67757] [PATCH 06/19] gnu: rust-grep-matcher-0.1: Update to 0.1.7.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-grep-matcher-0.1): Update to 0.1.7.

Change-Id: I9cb95066535c129a93a15e49e378e50ee030c71e
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f5760209a0..c457a918f5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33666,7 +33666,7 @@ (define-public rust-grep-cli-0.1
 (define-public rust-grep-matcher-0.1
   (package
     (name "rust-grep-matcher")
-    (version "0.1.5")
+    (version "0.1.7")
     (source
      (origin
        (method url-fetch)
@@ -33675,7 +33675,7 @@ (define-public rust-grep-matcher-0.1
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1k618qni7bgx9mvdp1kaznqjvn2gpgiasrmi0cqd6b066cy5c9vd"))))
+         "00mcjar5b6y1pwf0gjdywzgh1fnp6jl612n9qznwyfm420d198s7"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#67757] [PATCH 07/19] gnu: rust-grep-regex-0.1: Update to 0.1.12.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-grep-regex-0.1): Update to 0.1.12.

Change-Id: I46a48f21f89df60d2d9410ae9953511f8dd71748
---
 gnu/packages/crates-io.scm | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c457a918f5..17d31ccb8b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33752,7 +33752,7 @@ (define-public rust-grep-printer-0.1
 (define-public rust-grep-regex-0.1
   (package
     (name "rust-grep-regex")
-    (version "0.1.9")
+    (version "0.1.12")
     (source
      (origin
        (method url-fetch)
@@ -33761,17 +33761,14 @@ (define-public rust-grep-regex-0.1
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "01mx4xsrfp5hf8dpnvld1svs6i5dpg6xghigp4wkhdlcfv4m658j"))))
+         "0393d2ydvq8qdgss8k7pbnfdns7ramlhxjk7pifdldd8bh9vnj7p"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-aho-corasick" ,rust-aho-corasick-0.7)
-        ("rust-bstr" ,rust-bstr-0.2)
-        ("rust-grep-matcher" ,rust-grep-matcher-0.1)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-regex" ,rust-regex-1)
-        ("rust-regex-syntax" ,rust-regex-syntax-0.6)
-        ("rust-thread-local" ,rust-thread-local-1))))
+     `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-grep-matcher" ,rust-grep-matcher-0.1)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-regex-automata" ,rust-regex-automata-0.4)
+                       ("rust-regex-syntax" ,rust-regex-syntax-0.8))))
     (home-page "https://github.com/BurntSushi/ripgrep")
     (synopsis "Use Rust's regex library with the grep crate")
     (description
-- 
2.41.0

[bug#67757] [PATCH 08/19] gnu: rust-ignore-0.4: Update to 0.4.21.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ignore-0.4): Update to 0.4.21.

Change-Id: Ia64804f67af92855859113f420912a7c373ad35a
---
 gnu/packages/crates-io.scm | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 17d31ccb8b..f65d3c9efb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37040,29 +37040,29 @@ (define-public rust-if-chain-1
 (define-public rust-ignore-0.4
   (package
     (name "rust-ignore")
-    (version "0.4.20")
+    (version "0.4.21")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "ignore" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "14kl9fv83klbnjxdv0y8lpwlj3gkypxf3vbrmm29m2jkmcyqgryv"))))
+        (base32 "0q3hs8ak1dsng3a0adxn2ysjdspazgdkmmm0mgl7h6l4mssd2ykl"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-globset" ,rust-globset-0.4)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-memchr" ,rust-memchr-2)
-        ("rust-regex" ,rust-regex-1)
-        ("rust-same-file" ,rust-same-file-1)
-        ("rust-thread-local" ,rust-thread-local-1)
-        ("rust-walkdir" ,rust-walkdir-2)
-        ("rust-winapi-util" ,rust-winapi-util-0.1))
+     `(#:cargo-inputs (("rust-crossbeam-deque" ,rust-crossbeam-deque-0.8)
+                       ("rust-globset" ,rust-globset-0.4)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-regex-automata" ,rust-regex-automata-0.4)
+                       ("rust-same-file" ,rust-same-file-1)
+                       ("rust-walkdir" ,rust-walkdir-2)
+                       ("rust-winapi-util" ,rust-winapi-util-0.1))
        #:cargo-development-inputs
-       (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5))))
-    (home-page "https://github.com/BurntSushi/ripgrep/tree/master/crates/ignore")
+       (("rust-bstr" ,rust-bstr-1)
+        ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5))))
+    (home-page
+     "https://github.com/BurntSushi/ripgrep/tree/master/crates/ignore")
     (synopsis "Efficiently match ignore files such as @file{.gitignore}")
     (description
      "This package provides a fast library for efficiently matching
-- 
2.41.0

[bug#67757] [PATCH 09/19] gnu: Add rust-memmap2-0.9.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-memmap2-0.9): New variable.

Change-Id: I3a4ed8a1756bb72bd3fb81cae06c45be40e2c5f7
---
 gnu/packages/crates-io.scm | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f65d3c9efb..e9274b9ab5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44565,8 +44565,32 @@ (define-public rust-memmap-0.2
        #:cargo-development-inputs
        (("rust-tempdir" ,rust-tempdir-0.3))))))
 
+(define-public rust-memmap2-0.9
+  (package
+    (name "rust-memmap2")
+    (version "0.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "memmap2" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0xckkh1i45g6y2g2lkb6b292pfj2wlrfk2fc4754q7dzga6s7ayy"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+                       ("rust-stable-deref-trait" ,rust-stable-deref-trait-1))
+       #:cargo-development-inputs (("rust-owning-ref" ,rust-owning-ref-0.4)
+                                   ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/RazrFalcon/memmap2-rs")
+    (synopsis "Cross-platform Rust API for memory-mapped file IO")
+    (description
+     "This package provides a Rust API for memory-mapped file IO.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-memmap2-0.7
   (package
+    (inherit rust-memmap2-0.9)
     (name "rust-memmap2")
     (version "0.7.1")
     (source
@@ -44576,19 +44600,13 @@ (define-public rust-memmap2-0.7
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1il82b0mw304jlwvl0m89aa8bj5dgmm3vbb0jg8lqlrk0p98i4zl"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-libc" ,rust-libc-0.2)
         ("rust-stable-deref-trait" ,rust-stable-deref-trait-1))
        #:cargo-development-inputs
        (("rust-owning-ref" ,rust-owning-ref-0.4)
-        ("rust-tempfile" ,rust-tempfile-3))))
-    (home-page "https://github.com/RazrFalcon/memmap2-rs")
-    (synopsis "Cross-platform Rust API for memory-mapped file IO")
-    (description
-     "This package provides a Rust API for memory-mapped file IO.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-memmap2-0.5
   (package
-- 
2.41.0

[bug#67757] [PATCH 10/19] gnu: rust-grep-searcher-0.1: Update to 0.1.13.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-grep-searcher-0.1): Update to 0.1.13.
[home-page]: Update to exact location of crate within ripgrep.

Change-Id: Id49df7543faa055b03a825551a04ee0d32b97425
---
 gnu/packages/crates-io.scm | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e9274b9ab5..22ee959e6a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33778,7 +33778,7 @@ (define-public rust-grep-regex-0.1
 (define-public rust-grep-searcher-0.1
   (package
     (name "rust-grep-searcher")
-    (version "0.1.8")
+    (version "0.1.13")
     (source
      (origin
        (method url-fetch)
@@ -33787,21 +33787,20 @@ (define-public rust-grep-searcher-0.1
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0gf2qkkfsywvzrqvfx6h88qzb68zmnvggvid1ljdqam51glvvgbz"))))
+         "0m1w35d9wnpv157g0adj3grqw0nkacqxv14mhgc65v4vyvj6llxs"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-bstr" ,rust-bstr-0.2)
-        ("rust-bytecount" ,rust-bytecount-0.6)
-        ("rust-encoding-rs" ,rust-encoding-rs-0.8)
-        ("rust-encoding-rs-io" ,rust-encoding-rs-io-0.1)
-        ("rust-grep-matcher" ,rust-grep-matcher-0.1)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-memmap" ,rust-memmap2-0.3))
-       #:cargo-development-inputs
-       (("rust-grep-regex" ,rust-grep-regex-0.1)
-        ("rust-regex" ,rust-regex-1))))
-    (home-page "https://github.com/BurntSushi/ripgrep")
+     `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-encoding-rs" ,rust-encoding-rs-0.8)
+                       ("rust-encoding-rs-io" ,rust-encoding-rs-io-0.1)
+                       ("rust-grep-matcher" ,rust-grep-matcher-0.1)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-memmap2" ,rust-memmap2-0.9))
+       #:cargo-development-inputs (("rust-grep-regex" ,rust-grep-regex-0.1)
+                                   ("rust-regex" ,rust-regex-1))))
+    (home-page
+     "https://github.com/BurntSushi/ripgrep/tree/master/crates/searcher")
     (synopsis "Line oriented regex searching as a library")
     (description
      "Fast line oriented regex searching as a library.")
-- 
2.41.0

[bug#67757] [PATCH 11/19] gnu: Add rust-grep-printer-0.2.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-grep-printer-0.2): New variable.

Change-Id: Ic830cbf5125f7419662d28cd61c28ae2da2082ab
---
 gnu/packages/crates-io.scm | 39 ++++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 22ee959e6a..f88d76bfe2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33716,8 +33716,38 @@ (define-public rust-grep-pcre2-0.1
     (description "Use PCRE2 with the grep crate.")
     (license (list license:expat license:unlicense))))
 
+(define-public rust-grep-printer-0.2
+  (package
+    (name "rust-grep-printer")
+    (version "0.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "grep-printer" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1cnf70gjnybfql0lmpr32dslb4xhxgc6h0dxwnv3ivla7jh14g3l"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-grep-matcher" ,rust-grep-matcher-0.1)
+                       ("rust-grep-searcher" ,rust-grep-searcher-0.1)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-termcolor" ,rust-termcolor-1))
+       #:cargo-development-inputs
+       (("rust-grep-regex" ,rust-grep-regex-0.1))))
+    (home-page "https://github.com/BurntSushi/ripgrep")
+    (synopsis "Standard printing of search results")
+    (description
+     "This package is an implementation of the grep crate's Sink trait that
+provides standard printing of search results, similar to grep itself.")
+    (license (list license:unlicense license:expat))))
+
 (define-public rust-grep-printer-0.1
   (package
+    (inherit rust-grep-printer-0.2)
     (name "rust-grep-printer")
     (version "0.1.6")
     (source
@@ -33729,7 +33759,6 @@ (define-public rust-grep-printer-0.1
        (sha256
         (base32
          "0wnw8khcvris8canv1dp58qh6vph18fml9qsnrsmdpxf9ni73hh5"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-base64" ,rust-base64-0.13)
@@ -33741,13 +33770,7 @@ (define-public rust-grep-printer-0.1
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-termcolor" ,rust-termcolor-1))
        #:cargo-development-inputs
-       (("rust-grep-regex" ,rust-grep-regex-0.1))))
-    (home-page "https://github.com/BurntSushi/ripgrep")
-    (synopsis "Standard printing of search results")
-    (description
-     "This package is an implementation of the grep crate's Sink trait that
-provides standard printing of search results, similar to grep itself.")
-    (license (list license:unlicense license:expat))))
+       (("rust-grep-regex" ,rust-grep-regex-0.1))))))
 
 (define-public rust-grep-regex-0.1
   (package
-- 
2.41.0

[bug#67757] [PATCH 12/19] gnu: rust-pcre2-sys-0.2: Update to 0.2.7.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pcre2-sys-0.2): Update to 0.2.7.
[source]: Remove unneeded build snippet.
[native-inputs]: Make prce2 a regular input.

Change-Id: I07bfd73ce4a60dd2fed4a3f7bb6adbeac7e70da5
---
 gnu/packages/crates-io.scm | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f88d76bfe2..afbea5fd77 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -53990,7 +53990,7 @@ (define-public rust-pcre2-0.2
 (define-public rust-pcre2-sys-0.2
   (package
     (name "rust-pcre2-sys")
-    (version "0.2.5")
+    (version "0.2.7")
     (source
      (origin
        (method url-fetch)
@@ -53999,18 +53999,14 @@ (define-public rust-pcre2-sys-0.2
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "08mp6yxrvadplwd0drdydzskvzapr6dri9fyy7xvhzn3krg0xhyy"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin (delete-file-recursively "pcre2") #t))))
+         "1wpdvb5kaj8ggd3z63mhviyv5nbwkb0xz7wlh6sc1wiwy9b5b3wg"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ("rust-pkg-config" ,rust-pkg-config-0.3)
-        ("rust-cc" ,rust-cc-1))))
-    (native-inputs
-     (list pcre2 pkg-config))
+     `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3)
+                       ("rust-cc" ,rust-cc-1))))
+    (native-inputs (list pkg-config))
+    (inputs (list pcre2))
     (home-page
      "https://github.com/BurntSushi/rust-pcre2")
     (synopsis "Low level bindings to PCRE2")
-- 
2.41.0

[bug#67757] [PATCH 13/19] gnu: rust-pcre2-0.2: Update to 0.2.6.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pcre2-0.2): Update to 0.2.6.
[native-inputs]: Separate pcre2 into inputs.

Change-Id: Iac385ad91bc73dae03b8ea462f0db900fcf0e229
---
 gnu/packages/crates-io.scm | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index afbea5fd77..b200f4fc45 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -53962,7 +53962,7 @@ (define-public rust-pcap-sys-0.1
 (define-public rust-pcre2-0.2
   (package
     (name "rust-pcre2")
-    (version "0.2.3")
+    (version "0.2.6")
     (source
      (origin
        (method url-fetch)
@@ -53971,16 +53971,14 @@ (define-public rust-pcre2-0.2
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1c8sn70h72llf26sya9v26zmaamq350q57nwv6fl6fwhd4phzcw5"))))
+         "19w80j4f87hzdxbh5iilhbmx0vv02aybxr1ximbd7hszxal577ac"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-pcre2-sys" ,rust-pcre2-sys-0.2)
-        ("rust-thread-local" ,rust-thread-local-1))))
-    (native-inputs
-     (list pcre2 pkg-config))
+     `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-pcre2-sys" ,rust-pcre2-sys-0.2))))
+    (native-inputs (list pkg-config))
+    (inputs (list pcre2))
     (home-page "https://github.com/BurntSushi/rust-pcre2")
     (synopsis "High level wrapper library for PCRE2")
     (description
-- 
2.41.0

[bug#67757] [PATCH 14/19] gnu: rust-grep-pcre2-0.1: Update to 0.1.7.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-grep-pcre2-0.1): Update to 0.1.7.
[native-inputs]: Move pcre2 to inputs.
[home-page]: Update to exact location in git.

Change-Id: I9cff41ade41f1b3e54ddaf7ef059c1e3979d44b6
---
 gnu/packages/crates-io.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b200f4fc45..9336dbcfc0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33693,7 +33693,7 @@ (define-public rust-grep-matcher-0.1
 (define-public rust-grep-pcre2-0.1
   (package
     (name "rust-grep-pcre2")
-    (version "0.1.5")
+    (version "0.1.7")
     (source
      (origin
        (method url-fetch)
@@ -33702,16 +33702,16 @@ (define-public rust-grep-pcre2-0.1
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0hfyxsavqzf4rb5vc2a4hhi8dqw75vw1h95hinp4km9b6yxyvv66"))))
+         "1zwb5acalq7rvy70z4gsarqmrfaqmf9016yvxz5f573434idai02"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-grep-matcher" ,rust-grep-matcher-0.1)
-        ("rust-pcre2" ,rust-pcre2-0.2))))
-    (native-inputs
-     (list pcre2 pkg-config))
+     `(#:cargo-inputs (("rust-grep-matcher" ,rust-grep-matcher-0.1)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-pcre2" ,rust-pcre2-0.2))))
+    (native-inputs (list pkg-config))
+    (inputs (list pcre2))
     (home-page
-     "https://github.com/BurntSushi/ripgrep")
+     "https://github.com/BurntSushi/ripgrep/tree/master/crates/pcre2")
     (synopsis "Use PCRE2 with the grep crate")
     (description "Use PCRE2 with the grep crate.")
     (license (list license:expat license:unlicense))))
-- 
2.41.0

[bug#67757] [PATCH 15/19] gnu: rust-winapi-util-0.1: Update to 0.1.6.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-winapi-util-0.1): Update to 0.1.6.

Change-Id: Ic1b445914d8abdda09a654e66e5ee6334f4fb9a0
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9336dbcfc0..9121bf5ccf 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -88437,7 +88437,7 @@ (define-public rust-winapi-i686-pc-windows-gnu-0.4
 (define-public rust-winapi-util-0.1
   (package
     (name "rust-winapi-util")
-    (version "0.1.5")
+    (version "0.1.6")
     (source
       (origin
         (method url-fetch)
@@ -88445,7 +88445,7 @@ (define-public rust-winapi-util-0.1
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "0y71bp7f6d536czj40dhqk0d55wfbbwqfp2ymqf1an5ibgl6rv3h"))))
+          "15i5lm39wd44004i9d5qspry2cynkrpvwzghr6s2c3dsk28nz7pj"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-winapi" ,rust-winapi-0.3))))
-- 
2.41.0

[bug#67757] [PATCH 16/19] gnu: rust-grep-cli-0.1: Update to 0.1.10.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-grep-cli-0.1): Update to 0.1.10.
[home-page]: Update to crate location in repository.

Change-Id: I5e9467944db0a6399277f381ae7da8307321583d
---
 gnu/packages/crates-io.scm | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9121bf5ccf..c280e7026f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33635,7 +33635,7 @@ (define-public rust-grep-0.2
 (define-public rust-grep-cli-0.1
   (package
     (name "rust-grep-cli")
-    (version "0.1.6")
+    (version "0.1.10")
     (source
      (origin
        (method url-fetch)
@@ -33643,20 +33643,17 @@ (define-public rust-grep-cli-0.1
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "12lyww4hl4cham9zqqssm3wcp1g3ffvi6906wl6hsiml9g1i1l9d"))))
+        (base32 "09fpb96qly8ipkm5ipg228lvvcxza0kp6x6hqhibdf4s0n67hh7a"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-atty" ,rust-atty-0.2)
-        ("rust-bstr" ,rust-bstr-0.2)
-        ("rust-globset" ,rust-globset-0.4)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-regex" ,rust-regex-1)
-        ("rust-same-file" ,rust-same-file-1)
-        ("rust-termcolor" ,rust-termcolor-1)
-        ("rust-winapi-util" ,rust-winapi-util-0.1))))
-    (home-page "https://github.com/BurntSushi/ripgrep")
+     `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-globset" ,rust-globset-0.4)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-termcolor" ,rust-termcolor-1)
+                       ("rust-winapi-util" ,rust-winapi-util-0.1))))
+    (home-page
+     "https://github.com/BurntSushi/ripgrep/tree/master/crates/cli")
     (synopsis "Utilities for search oriented command line applications")
     (description
      "This crate provides utilities for search oriented command line
-- 
2.41.0

[bug#67757] [PATCH 17/19] gnu: Add rust-grep-0.3.

[Jaeme Sifat via Guix-patches via]

* 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
-- 
2.41.0

[bug#67757] [PATCH 18/19] gnu: rust-termcolor-1: Update to 1.4.0.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-termcolor-1): Update to 1.4.0.

Change-Id: I124d135341e8932a9c027a895ffbabad93a1cb98
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a9b41f34d7..9c0ca3bd8b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -77950,14 +77950,14 @@ (define-public rust-termbox-sys-0.2
 (define-public rust-termcolor-1
   (package
     (name "rust-termcolor")
-    (version "1.3.0")
+    (version "1.4.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "termcolor" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0r1byqaq6f97qd0wc7k09lza190apvj9301s2afsp6m6gp9vm4v0"))))
+        (base32 "0jfllflbxxffghlq6gx4csv0bv0qv77943dcx01h9zssy39w66zz"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#67757] [PATCH 19/19] gnu: ripgrep: Update to 14.0.3.

[Jaeme Sifat via Guix-patches via]

Upstream developers have decided to move documentation generations and
completions as generated output of the built binary itself. This presents an
outstanding problem for cross-compilation. Either this can be fixed in a later
patch or upstream can be contacted to reverse the change in a later version.

* gnu/packages/rust-apps.scm (ripgrep): Update to 14.0.3.

Change-Id: Iedf371a36d704072f4f3a9a3765c77dd22ea6642
---
 gnu/packages/rust-apps.scm | 107 +++++++++++++++++++++----------------
 1 file changed, 61 insertions(+), 46 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index ab8534f64a..b99186c4e1 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -1149,61 +1149,76 @@ (define-public maturin
 (define-public ripgrep
   (package
     (name "ripgrep")
-    (version "13.0.0")
+    (version "14.0.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "ripgrep" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "1gv4imhjgxmyxaa996yshcjlakmrjw9pf4rycp90pq675cn9sz7k"))))
+        (base32 "192n1lih9vzhf7r2ak985fap23x608qjdq9pqjcf43h3g9mjzjh0"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-bstr" ,rust-bstr-0.2)
-        ("rust-clap" ,rust-clap-2)
-        ("rust-grep" ,rust-grep-0.2)
-        ("rust-ignore" ,rust-ignore-0.4)
-        ("rust-jemallocator" ,rust-jemallocator-0.3)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-num-cpus" ,rust-num-cpus-1)
-        ("rust-regex" ,rust-regex-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-termcolor" ,rust-termcolor-1))
-       #:cargo-development-inputs
-       (("rust-serde" ,rust-serde-1)
-        ("rust-serde-derive" ,rust-serde-derive-1)
-        ("rust-walkdir" ,rust-walkdir-2))
-       #:modules ((ice-9 match)
-                  (guix build cargo-build-system)
-                  (guix build utils))
-       #:install-source? #f
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'build 'install-manpage
-           ;; NOTE: This is done before 'check so that there's only one output
-           ;; directory with the man page.
-           (lambda* (#:key outputs #:allow-other-keys)
-             (match (find-files "target" "^rg\\.1$")
-               ((manpage)
-                (install-file manpage (string-append
-                                       (assoc-ref outputs "out")
-                                       "/share/man/man1"))))
-             #t)))
-       #:features '("pcre2")))
-    (inputs
-     (list pcre2))
-    (native-inputs
-     (list asciidoc pkg-config))
+     (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
+                   (add-after 'install 'install-extras
+                     (lambda* (#:key outputs #:allow-other-keys)
+                       (let* ((out (assoc-ref outputs "out"))
+                              (share (string-append out "/share"))
+                              (bash-completions-dir (string-append share
+                                                     "/bash-completion/completions"))
+                              (zsh-completions-dir (string-append share
+                                                    "/zsh/site-functions"))
+                              (fish-completions-dir (string-append share
+                                                     "/fish/vendor_completions.d"))
+                              (man1 (string-append share "/man/man1"))
+                              (rg (string-append out "/bin/rg")))
+                         (unless #$(%current-target-system)
+                           (mkdir-p man1)
+                           (with-output-to-file (string-append man1 "/rg.1")
+                             (lambda _
+                               (invoke rg "--generate" "man")))
+                           (mkdir-p bash-completions-dir)
+                           (with-output-to-file (string-append
+                                                 bash-completions-dir "/rg")
+                             (lambda _
+                               (invoke rg "--generate" "complete-bash")))
+                           (mkdir-p zsh-completions-dir)
+                           (with-output-to-file (string-append
+                                                 zsh-completions-dir "/_rg")
+                             (lambda _
+                               (invoke rg "--generate" "complete-zsh")))
+                           (mkdir-p fish-completions-dir)
+                           (with-output-to-file (string-append
+                                                 fish-completions-dir
+                                                 "/rg.fish")
+                             (lambda _
+                               (invoke rg "--generate" "complete-fish"))))))))
+      #:features '(list "pcre2")))
+    (inputs (list pcre2))
+    (native-inputs (list pkg-config))
     (home-page "https://github.com/BurntSushi/ripgrep")
-    (synopsis "Line-oriented search tool")
+    (synopsis "Line-oriented search tool and Rust successor to @command{grep}")
     (description
-     "ripgrep is a line-oriented search tool that recursively searches
-your current directory for a regex pattern while respecting your
-gitignore rules.")
+     "@code{ripgrep} (@command{rg}) is a line-oriented search tool that
+recursively searches your current directory for a regex pattern while
+respecting your gitignore rules. @code{ripgrep} is similar to other popular
+search tools like The Silver Searcher, @command{ack} and @command{grep}.")
     (license (list license:unlicense license:expat))))
 
 (define-public rot8
-- 
2.41.0

[bug#67757] [PATCH vREVISION 19/19] gnu: ripgrep: Update to 14.0.3.

[Jaeme Sifat via Guix-patches via]

ripgrep is added as a native-input for cross-compilation.

* gnu/packages/rust-apps.scm (ripgrep): Update to 14.0.3.

Change-Id: Iedf371a36d704072f4f3a9a3765c77dd22ea6642
---
 gnu/packages/rust-apps.scm | 108 +++++++++++++++++++++----------------
 1 file changed, 62 insertions(+), 46 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index ab8534f64a..30b98c4db0 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -1149,61 +1149,77 @@ (define-public maturin
 (define-public ripgrep
   (package
     (name "ripgrep")
-    (version "13.0.0")
+    (version "14.0.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "ripgrep" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "1gv4imhjgxmyxaa996yshcjlakmrjw9pf4rycp90pq675cn9sz7k"))))
+        (base32 "192n1lih9vzhf7r2ak985fap23x608qjdq9pqjcf43h3g9mjzjh0"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-bstr" ,rust-bstr-0.2)
-        ("rust-clap" ,rust-clap-2)
-        ("rust-grep" ,rust-grep-0.2)
-        ("rust-ignore" ,rust-ignore-0.4)
-        ("rust-jemallocator" ,rust-jemallocator-0.3)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-num-cpus" ,rust-num-cpus-1)
-        ("rust-regex" ,rust-regex-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-termcolor" ,rust-termcolor-1))
-       #:cargo-development-inputs
-       (("rust-serde" ,rust-serde-1)
-        ("rust-serde-derive" ,rust-serde-derive-1)
-        ("rust-walkdir" ,rust-walkdir-2))
-       #:modules ((ice-9 match)
-                  (guix build cargo-build-system)
-                  (guix build utils))
-       #:install-source? #f
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'build 'install-manpage
-           ;; NOTE: This is done before 'check so that there's only one output
-           ;; directory with the man page.
-           (lambda* (#:key outputs #:allow-other-keys)
-             (match (find-files "target" "^rg\\.1$")
-               ((manpage)
-                (install-file manpage (string-append
-                                       (assoc-ref outputs "out")
-                                       "/share/man/man1"))))
-             #t)))
-       #:features '("pcre2")))
-    (inputs
-     (list pcre2))
-    (native-inputs
-     (list asciidoc pkg-config))
+     (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
+                   (add-after 'install 'install-extras
+                     (lambda* (#:key outputs #:allow-other-keys)
+                       (let* ((out (assoc-ref outputs "out"))
+                              (share (string-append out "/share"))
+                              (bash-completions-dir (string-append share
+                                                     "/bash-completion/completions"))
+                              (zsh-completions-dir (string-append share
+                                                    "/zsh/site-functions"))
+                              (fish-completions-dir (string-append share
+                                                     "/fish/vendor_completions.d"))
+                              (man1 (string-append share "/man/man1"))
+                              (rg (string-append out "/bin/rg")))
+                           (mkdir-p man1)
+                           (with-output-to-file (string-append man1 "/rg.1")
+                             (lambda _
+                               (invoke rg "--generate" "man")))
+                           (mkdir-p bash-completions-dir)
+                           (with-output-to-file (string-append
+                                                 bash-completions-dir "/rg")
+                             (lambda _
+                               (invoke rg "--generate" "complete-bash")))
+                           (mkdir-p zsh-completions-dir)
+                           (with-output-to-file (string-append
+                                                 zsh-completions-dir "/_rg")
+                             (lambda _
+                               (invoke rg "--generate" "complete-zsh")))
+                           (mkdir-p fish-completions-dir)
+                           (with-output-to-file (string-append
+                                                 fish-completions-dir
+                                                 "/rg.fish")
+                             (lambda _
+                               (invoke rg "--generate" "complete-fish")))))))
+      #:features '(list "pcre2")))
+    (inputs (list pcre2))
+    (native-inputs (cons* pkg-config (if (%current-target-system)
+                                         '(this-package)
+                                         '())))
     (home-page "https://github.com/BurntSushi/ripgrep")
-    (synopsis "Line-oriented search tool")
+    (synopsis "Line-oriented search tool and Rust successor to @command{grep}")
     (description
-     "ripgrep is a line-oriented search tool that recursively searches
-your current directory for a regex pattern while respecting your
-gitignore rules.")
+     "@code{ripgrep} (@command{rg}) is a line-oriented search tool that
+recursively searches your current directory for a regex pattern while
+respecting your gitignore rules. @code{ripgrep} is similar to other popular
+search tools like The Silver Searcher, @command{ack} and @command{grep}.")
     (license (list license:unlicense license:expat))))

 (define-public rot8

base-commit: 34eaf5714efcb847c9cba03a055a17e790c1d017
prerequisite-patch-id: c76d30ce17e81fcb9a17076ab774701dab02a73d
prerequisite-patch-id: ea3be5ace9380e325bcebaafc35366ea61951e67
prerequisite-patch-id: 137b468ffdb64d49aadc2424250ba8dce23f0ef6
prerequisite-patch-id: dffd840d8bc3e43fd45b724eb3a895e64d41a002
prerequisite-patch-id: 11ec518e0d39de6c4bfcdfe31c035c6f2887323a
prerequisite-patch-id: 62383a1c062b97123d1d3c5f634d0c9a2bdfe7cc
prerequisite-patch-id: 553a742b3644af0a661914edf08cda70be8a5987
prerequisite-patch-id: f2ea7779419dffc231e95f27ae6b6881f07ed426
prerequisite-patch-id: c7daea444b036d74d01e23a2dd04baf1b46caf62
prerequisite-patch-id: 7cbb96f718ca95d99009cf00ab89f63f1a6037b9
prerequisite-patch-id: e07fae6bf944c5d40811817f52500fbca1f63edd
prerequisite-patch-id: b649a5e142b26651b1c59a980ba55d92ea7e2886
prerequisite-patch-id: 46dbdbddf8c613e32c81a62368885005f1e8bbd5
prerequisite-patch-id: 142cf6f17527761f1d8565a7a666a871464e66e0
prerequisite-patch-id: d4f2db9376d8a935ef53e5d24b61191209320964
prerequisite-patch-id: f40d92640db6b0d0ab1980a04b79557c808ad7b9
prerequisite-patch-id: 215fa727397342dc21b161e5641aa3332bd48aab
prerequisite-patch-id: 99bb791003185b146e895bb06c51ad49f504f4c9
--
2.41.0

bug#67757: [PATCH 00/19 rust-team] gnu: rust-apps: Update ripgrep to 14.0.3

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

Thanks for the patches! I've pushed them to the rust-team branch and
they should be merged back into master soon™.

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]