GNU bug report logs - #68115
[PATCH 00/18 rust-team] rust-apps: bat: Update to 0.24

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 68115 in the body.
You can then email your comments to 68115 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: guix-patches <at> gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH 00/18 rust-team] rust-apps: bat: Update to 0.24
Date: Fri, 29 Dec 2023 19:05:03 -0500

This patchset updates bat, the cat clone, to 0.24 as well as refactoring any
package definitions along the way.

bat has a really peculiar way to packaging its extra files (completions +
manual). Mainly, this results in bat.1 not having the correct project
exectuable name instead using the placeholder.

If you can find a solution to this, I'll be glad to hear it. Not even nixpkgs
packages the extra files.

Jaeme Sifat (18):
  gnu: Add rust-fancy-regex-0.11.
  gnu: Add rust-syntect-5.
  gnu: Add rust-fsio-0.4.
  gnu: Add rust-run-script-0.10.
  gnu: Add rust-print-bytes-0.7.
  gnu: Add rust-os-str-bytes-6.4.
  gnu: Add rust-nu-ansi-term-0.49.
  gnu: Add rust-etcetera-0.8.
  gnu: Add rust-clircle-0.4.
  gnu: rust-clircle-0.3: Allow building.
  gnu: Add rust-bugreport-0.5.
  gnu: rust-bugreport-0.4: Update to 0.4.1.
  gnu: rust-empfindung-0.2: Update to 0.2.6.
  gnu: Add rust-crc64-2.
  gnu: rust-crc64-1: Allow building.
  gnu: Add rust-termcolor-1.2.
  gnu: rust-ansi-colours-1: Update to 1.2.2.
  gnu: bat: Update to 0.24.0.

 gnu/packages/crates-graphics.scm |  15 +-
 gnu/packages/crates-io.scm       | 328 +++++++++++++++++++++++++++----
 gnu/packages/rust-apps.scm       |  85 +++++---
 gnu/packages/shells.scm          |  36 +++-
 4 files changed, 385 insertions(+), 79 deletions(-)


base-commit: 5844d18a8905ee3f62ccefe084dce4de61288fbf
prerequisite-patch-id: 26f99ffe625016ac09bcce1a95d62c271ea1b23b
prerequisite-patch-id: 117c5537eb0db1e776e5d0ca62a931db582926db
prerequisite-patch-id: f011e6b1a58ebd7efbd6809317f46e830a45175b
prerequisite-patch-id: c0855af5363dc7d96f58687ac9fca5bb2caeec28
--
2.41.0

Message #8 received at 68115 <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: 68115 <at> debbugs.gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH 14/18] gnu: Add rust-crc64-2.
Date: Fri, 29 Dec 2023 19:40:25 -0500

* gnu/packages/crates-io.scm (rust-crc64-2): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 612bfc614f..2a505f3cba 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -15470,25 +15470,38 @@ (define-public rust-crc32fast-1
      "Fast, SIMD-accelerated CRC32 (IEEE) checksum computation.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-crc64-1
+(define-public rust-crc64-2
   (package
     (name "rust-crc64")
-    (version "1.0.0")
+    (version "2.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "crc64" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0469vp0q9431pqx1236g60if5q3xyxpv4h14smkd45dfzsa6aqjm"))))
+        (base32 "1wwqdss36dmhz4fd0wynlaig463l4dwvr21db1fvf6aypapy61r7"))))
     (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
     (home-page "https://github.com/badboy/crc64-rs")
     (synopsis "Rust CRC64 checksum implementation")
-    (description "This package provides a CRC64 checksum implementation in
-Rust.")
+    (description
+     "This package provides a CRC64 checksum implementation in Rust.")
     (license license:bsd-3)))
 
+(define-public rust-crc64-1
+  (package
+    (inherit rust-crc64-2)
+    (name "rust-crc64")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "crc64" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0469vp0q9431pqx1236g60if5q3xyxpv4h14smkd45dfzsa6aqjm"))))
+    (arguments `(#:skip-build? #t))))
+
 (define-public rust-crc-catalog-2
   (package
     (name "rust-crc-catalog")
-- 
2.41.0

Message #11 received at 68115 <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: 68115 <at> debbugs.gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH 05/18] gnu: Add rust-print-bytes-0.7.
Date: Fri, 29 Dec 2023 19:40:16 -0500

* gnu/packages/crates-io.scm (rust-print-bytes-0.7): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bc1b3143a7..c219f3e967 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51813,6 +51813,24 @@ (define-public rust-print-bytes-1
 losslessly as possible.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-print-bytes-0.7
+  (package
+    (inherit rust-print-bytes-1)
+    (name "rust-print-bytes")
+    (version "0.7.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "print_bytes" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "09qlcf6iiadg8snmpbv43h8471mmqx4nhyksnm6ci1p7ygv1ch19"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-print-bytes" ,rust-print-bytes-1))
+       #:cargo-development-inputs
+       (("rust-os-str-bytes" ,rust-os-str-bytes-6))))))
+
 (define-public rust-print-bytes-0.5
   (package
     (inherit rust-print-bytes-1)
-- 
2.41.0

Message #14 received at 68115 <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: 68115 <at> debbugs.gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH 03/18] gnu: Add rust-fsio-0.4.
Date: Fri, 29 Dec 2023 19:40:14 -0500

* gnu/packages/crates-io.scm (rust-fsio-0.4): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a267ee3c70..901903ffac 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -26298,6 +26298,37 @@ (define-public rust-fs-extra-1
 process and much more.")
     (license license:expat)))
 
+(define-public rust-fsio-0.4
+  (package
+    (name "rust-fsio")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "fsio" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1l1nkb06s8xx84yrba5nj86wm80knv40bmy54nrl3i0cpqqcxl6s"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-dunce" ,rust-dunce-1)
+        ("rust-rand" ,rust-rand-0.8))
+       #:cargo-development-inputs
+       (("rust-doc-comment" ,rust-doc-comment-0.3))))
+    (home-page "http://github.com/sagiegurari/fsio")
+    (synopsis "File System and Path utility functions in Rust")
+    (description
+     "This crate contains utility functions for path, file and directory handling.
+There are multiple main modules for fsio:
+
+@enumerate
+@item @code{fsio::path}: Holds path related functions and traits.
+@item @code{fsio::file}:  File utility functions such as read_file, write_file, etc.
+@item @code{fsio::directory}: Directory specific utility functions.
+@end enumerate\n")
+    (license license:asl2.0)))
+
 (define-public rust-fs-set-times-0.19
   (package
     (name "rust-fs-set-times")
-- 
2.41.0

Message #17 received at 68115 <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: 68115 <at> debbugs.gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH 04/18] gnu: Add rust-run-script-0.10.
Date: Fri, 29 Dec 2023 19:40:15 -0500

* gnu/packages/crates-io.scm (rust-run-script-0.10): New variable.

Change-Id: I6e31c8be9b7f48082a1787fdb58593fbf864d753
---
 gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 901903ffac..bc1b3143a7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -59470,6 +59470,32 @@ (define-public rust-rpassword-4
        (sha256
         (base32 "17z99xazhhbaczw0ib1vnnq450j0zacdn8b2zcbdir68sdbicdwr"))))))
 
+(define-public rust-run-script-0.10
+  (package
+    (name "rust-run-script")
+    (version "0.10.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "run_script" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ix9kf1b3h5vmdadpv7rfxylmj8mphlbx0xgv6frhy4dqpyri7w2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-fsio" ,rust-fsio-0.4))
+       #:cargo-development-inputs
+       (("rust-doc-comment" ,rust-doc-comment-0.3))))
+    (home-page "http://github.com/sagiegurari/run_script")
+    (synopsis "Run shell scripts in Rust")
+    (description
+     "This library enables to invoke shell scripts based on their content.  While
+@code{std::process::Command} works great to execute standalone command, you need more
+manual code to take a script text and execute it.  For this purpose, this library was
+created.")
+    (license license:asl2.0)))
+
 (define-public rust-runtime-0.3
   (package
     (name "rust-runtime")
-- 
2.41.0

Message #20 received at 68115 <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: 68115 <at> debbugs.gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH 11/18] gnu: Add rust-bugreport-0.5.
Date: Fri, 29 Dec 2023 19:40:22 -0500

* gnu/packages/crates-io.scm (rust-bugreport-0.5): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6e690a2da4..3a085c1674 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -8490,24 +8490,26 @@ (define-public rust-bufstream-0.1
 half is separately buffered.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-bugreport-0.4
+(define-public rust-bugreport-0.5
   (package
     (name "rust-bugreport")
-    (version "0.4.0")
+    (version "0.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "bugreport" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0gday6f2brqgzl12a0vf7fx1hh1mim6gdjxc6dfwk9v4i19pxsd0"))))
+        (base32 "1jcq9ywxyd7fw1ing8ixna0cfcs5lrviyvx6h6080ir532w20lak"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-git-version" ,rust-git-version-0.3)
         ("rust-shell-escape" ,rust-shell-escape-0.1)
-        ("rust-sys-info" ,rust-sys-info-0.9))))
+        ("rust-sys-info" ,rust-sys-info-0.9))
+       #:cargo-development-inputs
+       (("rust-pretty-assertions" ,rust-pretty-assertions-1)
+        ("rust-tempfile" ,rust-tempfile-3))))
     (home-page "https://github.com/sharkdp/bugreport")
     (synopsis "Collect system and environment information for bug reports")
     (description
@@ -8516,6 +8518,25 @@ (define-public rust-bugreport-0.4
 users can send along with a bug report.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-bugreport-0.4
+  (package
+    (inherit rust-bugreport-0.5)
+    (name "rust-bugreport")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "bugreport" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0gday6f2brqgzl12a0vf7fx1hh1mim6gdjxc6dfwk9v4i19pxsd0"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-git-version" ,rust-git-version-0.3)
+        ("rust-shell-escape" ,rust-shell-escape-0.1)
+        ("rust-sys-info" ,rust-sys-info-0.9))))))
+
 (define-public rust-build-const-0.2
   (package
     (name "rust-build-const")
-- 
2.41.0

Message #23 received at 68115 <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: 68115 <at> debbugs.gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH 10/18] gnu: rust-clircle-0.3: Allow building.
Date: Fri, 29 Dec 2023 19:40:21 -0500

* gnu/packages/crates-io.scm (rust-clircle-0.3): Allow building.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c5bdac95b7..6e690a2da4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12166,12 +12166,14 @@ (define-public rust-clircle-0.3
        (sha256
         (base32 "15p36klnsgjimfswi0mjc7wsh4b662v7gbfinh56ipk3bacbv2z6"))))
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-serde" ,rust-serde-1)
-        ("rust-winapi" ,rust-winapi-0.3))))))
+        ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs
+       (("rust-nix" ,rust-nix-0.19)
+        ("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-cloudabi-0.1
   (package
-- 
2.41.0

Message #26 received at 68115 <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: 68115 <at> debbugs.gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH 17/18] gnu: rust-ansi-colours-1: Update to 1.2.2.
Date: Fri, 29 Dec 2023 19:40:28 -0500

* gnu/packages/crates-graphics.scm (rust-ansi-colours-1): Update to 1.2.2.

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

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 8f1c773607..4366eca8f0 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -108,7 +108,7 @@ (define-public rust-andrew-0.2
 (define-public rust-ansi-colours-1
   (package
     (name "rust-ansi-colours")
-    (version "1.1.1")
+    (version "1.2.2")
     (source
      (origin
        (method url-fetch)
@@ -117,16 +117,19 @@ (define-public rust-ansi-colours-1
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "03b2365y0ffkvqw61bc4imz6661jvi39vcs4q6q5d43znqrq4rrj"))))
+         "104aj4fi8nxdb9c5ahpwn53afmfcdzmwi3k9rawl3lvm42ymh5ba"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-rgb" ,rust-rgb-0.8))
+       (("rust-ansi-term" ,rust-ansi-term-0.12)
+        ("rust-rgb" ,rust-rgb-0.8)
+        ("rust-termcolor" ,rust-termcolor-1.2))
        #:cargo-development-inputs
-       (("rust-crc64" ,rust-crc64-1)
-        ("rust-criterion" ,rust-criterion-0.3)
+       (("rust-crc64" ,rust-crc64-2)
+        ("rust-criterion" ,rust-criterion-0.5)
         ("rust-empfindung" ,rust-empfindung-0.2)
-        ("rust-lab" ,rust-lab-0.11))))
+        ("rust-lab" ,rust-lab-0.11)
+        ("rust-rgb" ,rust-rgb-0.8))))
     (home-page "https://github.com/mina86/ansi_colours")
     (synopsis "Palette converter between true-colour and ANSI terminal")
     (description
-- 
2.41.0

Message #29 received at 68115 <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: 68115 <at> debbugs.gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH 16/18] gnu: Add rust-termcolor-1.2.
Date: Fri, 29 Dec 2023 19:40:27 -0500

* gnu/packages/crates-io.scm (rust-termcolor-1.2): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4827dab12f..29acc3f383 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -73187,6 +73187,19 @@ (define-public rust-termcolor-1
     (license (list license:unlicense
                    license:expat))))
 
+(define-public rust-termcolor-1.2
+  (package
+    (inherit rust-termcolor-1)
+    (name "rust-termcolor")
+    (version "1.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "termcolor" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1dmrbsljxpfng905qkaxljlwjhv8h0i3969cbiv5rb7y8a4wymdy"))))))
+
 (define-public rust-termcolor-0.3
   (package
     (inherit rust-termcolor-1)
-- 
2.41.0

Message #32 received at 68115 <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: 68115 <at> debbugs.gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH 18/18] gnu: bat: Update to 0.24.0.
Date: Fri, 29 Dec 2023 19:40:29 -0500

* gnu/packages/rust-apps.scm (bat): Update to 0.24.0.
[arguments]: Add 'install-extras step for completions and manpage.

Change-Id: Ibcd82fbd297fb84ab265486694126aed77862dd8
---
 gnu/packages/rust-apps.scm | 85 ++++++++++++++++++++++++++------------
 1 file changed, 59 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index df731d4b61..200c8a39ef 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -78,6 +78,7 @@ (define-module (gnu packages rust-apps)
   #:use-module (gnu packages kde)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages networking)
+  #:use-module (gnu packages shells)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
@@ -213,59 +214,91 @@ (define-public alfis
 (define-public bat
   (package
     (name "bat")
-    (version "0.20.0")
+    (version "0.24.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "bat" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "05sj0chxpai26fhk1k7p5m54v3j7n1x64ayx53mcimsj1skdr77m"))))
+        (base32 "11nc2iv2qhd1bs16yijqq934864ybnmg485rny70scy26xb9xk4x"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-ansi-colours" ,rust-ansi-colours-1)
-        ("rust-ansi-term" ,rust-ansi-term-0.12)
-        ("rust-atty" ,rust-atty-0.2)
+     (list
+      #:install-source? #f
+      #:cargo-inputs
+      `(("rust-ansi-colours" ,rust-ansi-colours-1)
         ("rust-bincode" ,rust-bincode-1)
-        ("rust-bugreport" ,rust-bugreport-0.4)
+        ("rust-bugreport" ,rust-bugreport-0.5)
         ("rust-bytesize" ,rust-bytesize-1)
-        ("rust-clap" ,rust-clap-2)
-        ("rust-clap" ,rust-clap-2)
-        ("rust-clircle" ,rust-clircle-0.3)
+        ("rust-clap" ,rust-clap-4)
+        ("rust-clircle" ,rust-clircle-0.4)
         ("rust-console" ,rust-console-0.15)
         ("rust-content-inspector" ,rust-content-inspector-0.2)
-        ("rust-dirs-next" ,rust-dirs-next-2)
-        ("rust-encoding" ,rust-encoding-0.2)
+        ("rust-encoding-rs" ,rust-encoding-rs-0.8)
+        ("rust-etcetera" ,rust-etcetera-0.8)
         ("rust-flate2" ,rust-flate2-1)
-        ("rust-git2" ,rust-git2-0.13)
+        ("rust-git2" ,rust-git2-0.18)
         ("rust-globset" ,rust-globset-0.4)
         ("rust-grep-cli" ,rust-grep-cli-0.1)
+        ("rust-home" ,rust-home-0.5)
+        ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.49)
         ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-os-str-bytes" ,rust-os-str-bytes-6.4)
         ("rust-path-abs" ,rust-path-abs-0.5)
+        ("rust-plist" ,rust-plist-1)
         ("rust-regex" ,rust-regex-1)
+        ("rust-run-script" ,rust-run-script-0.10)
         ("rust-semver" ,rust-semver-1)
         ("rust-serde" ,rust-serde-1)
-        ("rust-serde-yaml" ,rust-serde-yaml-0.8)
+        ("rust-serde-yaml" ,rust-serde-yaml-0.9)
         ("rust-shell-words" ,rust-shell-words-1)
-        ("rust-syntect" ,rust-syntect-4)
+        ("rust-syntect" ,rust-syntect-5)
         ("rust-thiserror" ,rust-thiserror-1)
         ("rust-unicode-width" ,rust-unicode-width-0.1)
         ("rust-walkdir" ,rust-walkdir-2)
         ("rust-wild" ,rust-wild-2))
-       #:cargo-development-inputs
-       (("rust-assert-cmd" ,rust-assert-cmd-2)
-        ("rust-nix" ,rust-nix-0.23)
-        ("rust-predicates" ,rust-predicates-2)
-        ("rust-serial-test" ,rust-serial-test-0.5)
+      #:cargo-development-inputs
+      `(("rust-assert-cmd" ,rust-assert-cmd-2)
+        ("rust-expect-test" ,rust-expect-test-1)
+        ("rust-nix" ,rust-nix-0.26)
+        ("rust-predicates" ,rust-predicates-3)
+        ("rust-serial-test" ,rust-serial-test-2)
         ("rust-tempfile" ,rust-tempfile-3)
-        ("rust-wait-timeout" ,rust-wait-timeout-0.2))))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list libgit2 zlib))
+        ("rust-wait-timeout" ,rust-wait-timeout-0.2))
+      #: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")))
+                (mkdir-p bash-completions-dir)
+                (mkdir-p zsh-completions-dir)
+                (mkdir-p fish-completions-dir)
+                (copy-file "assets/completions/bat.bash.in"
+                           (string-append bash-completions-dir "/bat"))
+                (copy-file "assets/completions/bat.zsh.in"
+                           (string-append zsh-completions-dir "/_bat"))
+                (copy-file "assets/completions/bat.fish.in"
+                           (string-append fish-completions-dir
+                                          "/bat.fish"))
+                (rename-file "assets/manual/bat.1.in" "assets/manual/bat.1")
+                (install-file "assets/manual/bat.1" man1)))))))
+    (native-inputs (list pkg-config))
+    (inputs (list libgit2-1.7 zlib))
     (home-page "https://github.com/sharkdp/bat")
-    (synopsis "@command{cat} clone with syntax highlighting and git integration")
+    (synopsis
+     "@command{cat} clone with syntax highlighting and git integration")
     (description
      "@command{bat} is a drop-in @command{cat} replacement featuring syntax
 highlighting for a large number of languages, git integration, and automatic
-- 
2.41.0

Message #35 received at 68115 <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: 68115 <at> debbugs.gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH 07/18] gnu: Add rust-nu-ansi-term-0.49.
Date: Fri, 29 Dec 2023 19:40:18 -0500

* gnu/packages/shells.scm (rust-nu-ansi-term-0.49): New variable.

Change-Id: If8ee4fef35b620df3a49dab845419bfdc7523062
---
 gnu/packages/shells.scm | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index fa933540e2..f04e07a903 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2022 Andrew Tropin <andrew <at> trop.in>
 ;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
 ;;; Copyright © 2023 David Pflug <david <at> pflug.io>
+;;; Copyright © 2023 Jaeme Sifat <jaeme <at> runbox.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1036,8 +1037,35 @@ (define-public nushell
 of commands called a ``pipeline''.")
     (license license:expat)))
 
+(define-public rust-nu-ansi-term-0.49
+  (package
+    (name "rust-nu-ansi-term")
+    (version "0.49.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "nu-ansi-term" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0s2svfnircd9jp06wk55qcbb9v5cadkfcjfg99vm21qdjg0x6wy0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-serde" ,rust-serde-1)
+        ("rust-windows-sys" ,rust-windows-sys-0.48))
+       #:cargo-development-inputs
+       (("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://www.nushell.sh")
+    (synopsis "Library for ANSI terminal colors and styles (bold, underline)")
+    (description
+     "This package is a library for ANSI terminal colors and styles (bold,
+underline).")
+    (license license:expat)))
+
 (define-public rust-nu-ansi-term-0.44
   (package
+    (inherit rust-nu-ansi-term-0.49)
     (name "rust-nu-ansi-term")
     (version "0.44.0")
     (source
@@ -1054,13 +1082,7 @@ (define-public rust-nu-ansi-term-0.44
        (("rust-doc-comment" ,rust-doc-comment-0.3)
         ("rust-overload" ,rust-overload-0.1)
         ("rust-serde" ,rust-serde-1)
-        ("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "https://www.nushell.sh")
-    (synopsis "Library for ANSI terminal colors and styles (bold, underline)")
-    (description
-     "This package is a library for ANSI terminal colors and styles (bold,
-underline).")
-    (license license:expat)))
+        ("rust-winapi" ,rust-winapi-0.3))))))
 
 (define-public rust-nu-cli-0.44
   (package
-- 
2.41.0

Message #38 received at 68115 <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: 68115 <at> debbugs.gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH 08/18] gnu: Add rust-etcetera-0.8.
Date: Fri, 29 Dec 2023 19:40:19 -0500

* gnu/packages/crates-io.scm (rust-etcetera-0.8): New variable.

Change-Id: I363cb9361f6d453f42501d9270114cd0e609c640
---
 gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 691df6e5e0..53d06aa5a8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -23774,6 +23774,32 @@ (define-public rust-escargot-0.3
        (("rust-serde" ,rust-serde-1)
         ("rust-serde-json" ,rust-serde-json-1))))))
 
+(define-public rust-etcetera-0.8
+  (package
+    (name "rust-etcetera")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "etcetera" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hxrsn75dirbjhwgkdkh0pnpqrnq17ypyhjpjaypgax1hd91nv8k"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-home" ,rust-home-0.5)
+                       ("rust-windows-sys" ,rust-windows-sys-0.48))))
+    (home-page "https://github.com/lunacookies/etcetera")
+    (synopsis
+     "Library for obtaining configuration, data, cache, & other directories")
+    (description
+     "This is a Rust library that allows you to determine the locations of
+configuration, data, cache & other files for your application.  Existing Rust
+libraries generally do not give you a choice in terms of which standards/conventions
+they follow.  Etcetera, on the other hand, gives you the choice.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-ethbloom-0.11
   (package
     (name "rust-ethbloom")
-- 
2.41.0

Message #41 received at 68115 <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: 68115 <at> debbugs.gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH 02/18] gnu: Add rust-syntect-5.
Date: Fri, 29 Dec 2023 19:40:13 -0500

* gnu/packages/crates-io.scm (rust-syntect-5): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d1dc7cbb65..a267ee3c70 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -71172,8 +71172,51 @@ (define-public rust-synstructure-test-traits-0.1
      "This package provides helper test traits for synstructure doctests.")
     (license license:expat)))
 
+(define-public rust-syntect-5
+  (package
+    (name "rust-syntect")
+    (version "5.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "syntect" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "14cg314vzabi45cdbqgcpav0dlx3d18blp24n3z8pl7q7cq4naz0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f
+       #:cargo-inputs
+       (("rust-bincode" ,rust-bincode-1)
+        ("rust-bitflags" ,rust-bitflags-1)
+        ("rust-fancy-regex" ,rust-fancy-regex-0.11)
+        ("rust-flate2" ,rust-flate2-1)
+        ("rust-fnv" ,rust-fnv-1)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-onig" ,rust-onig-6)
+        ("rust-plist" ,rust-plist-1)
+        ("rust-regex-syntax" ,rust-regex-syntax-0.7)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-walkdir" ,rust-walkdir-2)
+        ("rust-yaml-rust" ,rust-yaml-rust-0.4))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-getopts" ,rust-getopts-0.2)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-0.6)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-regex" ,rust-regex-1))))
+    (home-page "https://github.com/trishume/syntect")
+    (synopsis "Library for syntax highlighting and code intelligence")
+    (description
+     "This package provides a library for syntax highlighting and code
+intelligence using Sublime Text's grammars.")
+    (license license:expat)))
+
 (define-public rust-syntect-4
   (package
+    (inherit rust-syntect-5)
     (name "rust-syntect")
     (version "4.6.0")
     (source
@@ -71184,7 +71227,6 @@ (define-public rust-syntect-4
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0cd0rbi5r83p9pqph0gyj3vgr18ihh54amv9dvh0pvl0prdq284b"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f                      ;missing files
        #:cargo-inputs
@@ -71208,13 +71250,7 @@ (define-public rust-syntect-4
         ("rust-getopts" ,rust-getopts-0.2)
         ("rust-pretty-assertions" ,rust-pretty-assertions-0.6)
         ("rust-rayon" ,rust-rayon-1)
-        ("rust-regex" ,rust-regex-1))))
-    (home-page "https://github.com/trishume/syntect")
-    (synopsis "Library for syntax highlighting and code intelligence")
-    (description
-     "This package provides a library for syntax highlighting and code
-intelligence using Sublime Text's grammars.")
-    (license license:expat)))
+        ("rust-regex" ,rust-regex-1))))))
 
 (define-public rust-syntex-errors-0.58
   (package
-- 
2.41.0

Message #44 received at 68115 <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: 68115 <at> debbugs.gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH 13/18] gnu: rust-empfindung-0.2: Update to 0.2.6.
Date: Fri, 29 Dec 2023 19:40:24 -0500

* gnu/packages/crates-io.scm (rust-empfindung-0.2): Update to 0.2.6.
[arguments]: Allow building.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d98a0e5989..612bfc614f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22459,19 +22459,25 @@ (define-public rust-embedded-hal-0.2
 (define-public rust-empfindung-0.2
   (package
     (name "rust-empfindung")
-    (version "0.2.4")
+    (version "0.2.6")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "empfindung" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1h68h3sxsa79a47jag3yim5jm63ffz72ifj46xkn12j2s5nss85l"))))
+        (base32 "1pxh4r196qfv1y1qlp9fn210sj75whaqa61fdasjd9ml6bn9bw4a"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-lab" ,rust-lab-0.11)
+        ("rust-rgb" ,rust-rgb-0.8))
+       #:cargo-development-inputs
+       (("rust-approx" ,rust-approx-0.5)
+        ("rust-criterion" ,rust-criterion-0.3)
+        ("rust-lab" ,rust-lab-0.11)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.6)
         ("rust-rgb" ,rust-rgb-0.8))))
     (home-page "https://github.com/mina86/empfindung")
     (synopsis "Rust implementation of the CIEDE2000 colour difference")
-- 
2.41.0

Message #47 received at 68115 <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: 68115 <at> debbugs.gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH 09/18] gnu: Add rust-clircle-0.4.
Date: Fri, 29 Dec 2023 19:40:20 -0500

* gnu/packages/crates-io.scm (rust-clircle-0.4): New variable.

Change-Id: I36750eb0edf8824fa86d075fcf6f3a93cafe0f22
---
 gnu/packages/crates-io.scm | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 53d06aa5a8..c5bdac95b7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12125,25 +12125,25 @@ (define-public rust-clippy-0.0
 pitfalls in Rust.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-clircle-0.3
+(define-public rust-clircle-0.4
   (package
     (name "rust-clircle")
-    (version "0.3.0")
+    (version "0.4.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "clircle" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "15p36klnsgjimfswi0mjc7wsh4b662v7gbfinh56ipk3bacbv2z6"))))
+        (base32 "0056l1bf2zmd7xs13xp8gxw9j9dngw4im0m8ijyifkrmsnz7rs68"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-cfg-if" ,rust-cfg-if-1)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-winapi" ,rust-winapi-0.3))))
+     `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs (("rust-nix" ,rust-nix-0.24)
+                                   ("rust-tempfile" ,rust-tempfile-3))))
     (home-page "https://github.com/niklasmohrin/clircle")
     (synopsis "Detect IO circles in your CLI apps arguments")
     (description
@@ -12153,6 +12153,26 @@ (define-public rust-clircle-0.3
 or to a file as well.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-clircle-0.3
+  (package
+    (inherit rust-clircle-0.4)
+    (name "rust-clircle")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "clircle" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "15p36klnsgjimfswi0mjc7wsh4b662v7gbfinh56ipk3bacbv2z6"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-winapi" ,rust-winapi-0.3))))))
+
 (define-public rust-cloudabi-0.1
   (package
     (name "rust-cloudabi")
-- 
2.41.0

Message #50 received at 68115 <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: 68115 <at> debbugs.gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH 06/18] gnu: Add rust-os-str-bytes-6.4.
Date: Fri, 29 Dec 2023 19:40:17 -0500

* gnu/packages/crates-io.scm (rust-os-str-bytes-6.4): New variable.

Change-Id: Iad851fa128a127f8f028b67720e8cb61c8c6494d
---
 gnu/packages/crates-io.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c219f3e967..691df6e5e0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -46418,6 +46418,26 @@ (define-public rust-os-str-bytes-6
 platform-native strings.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-os-str-bytes-6.4
+  (package
+    (inherit rust-os-str-bytes-6)
+    (name "rust-os-str-bytes")
+    (version "6.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "os_str_bytes" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1vi3wx4zs8wgfhhzbk1n279gn8yp0n4l8s8wyb4mfm7avawj0y4v"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-memchr" ,rust-memchr-2)
+        ("rust-print-bytes" ,rust-print-bytes-0.7)
+        ("rust-uniquote" ,rust-uniquote-3))
+       #:cargo-development-inputs
+       (("rust-getrandom" ,rust-getrandom-0.2))))))
+
 (define-public rust-os-str-bytes-4
   (package
     (inherit rust-os-str-bytes-6)
-- 
2.41.0

Message #53 received at 68115 <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: 68115 <at> debbugs.gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH 01/18] gnu: Add rust-fancy-regex-0.11.
Date: Fri, 29 Dec 2023 19:40:12 -0500

* gnu/packages/crates-io.scm (rust-fancy-regex-0.11): New variable.

Change-Id: I1dabe4d2aab7869ed1df098b5901bb951fd125d0
---
 gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index dc47fe4cac..d1dc7cbb65 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -24348,23 +24348,24 @@ (define-public rust-fallible-streaming-iterator-0.1
     (description "Fallible streaming iteration")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-fancy-regex-0.7
+(define-public rust-fancy-regex-0.11
   (package
     (name "rust-fancy-regex")
-    (version "0.7.1")
+    (version "0.11.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "fancy-regex" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1krwc8mbj8zv4ahvh3lqkmfxf38cg79ya02by19fn4jil1h8aswx"))))
+        (base32 "18j0mmzfycibhxhhhfja00dxd1vf8x5c28lbry224574h037qpxr"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-bit-set" ,rust-bit-set-0.5)
-        ("rust-regex" ,rust-regex-1))))
+     `(#:cargo-inputs (("rust-bit-set" ,rust-bit-set-0.5)
+                       ("rust-regex" ,rust-regex-1))
+       #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3)
+                                   ("rust-matches" ,rust-matches-0.1)
+                                   ("rust-quickcheck" ,rust-quickcheck-1))))
     (home-page "https://github.com/fancy-regex/fancy-regex")
     (synopsis "Implementation of regexes with a rich set of features")
     (description
@@ -24375,6 +24376,24 @@ (define-public rust-fancy-regex-0.7
 supported in purely NFA-based implementations.")
     (license license:expat)))
 
+(define-public rust-fancy-regex-0.7
+  (package
+    (inherit rust-fancy-regex-0.11)
+    (name "rust-fancy-regex")
+    (version "0.7.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "fancy-regex" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1krwc8mbj8zv4ahvh3lqkmfxf38cg79ya02by19fn4jil1h8aswx"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-bit-set" ,rust-bit-set-0.5)
+        ("rust-regex" ,rust-regex-1))))))
+
 (define-public rust-fast-chemail-0.9
   (package
     (name "rust-fast-chemail")
-- 
2.41.0

Message #56 received at 68115 <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: 68115 <at> debbugs.gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH 15/18] gnu: rust-crc64-1: Allow building.
Date: Fri, 29 Dec 2023 19:40:26 -0500

* gnu/packages/crates-io.scm (rust-crc64-1): Allow building.

Change-Id: I986a898935c8b06438dc90bebc70c0566b349a19
---
 gnu/packages/crates-io.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2a505f3cba..4827dab12f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -15499,8 +15499,7 @@ (define-public rust-crc64-1
        (uri (crate-uri "crc64" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0469vp0q9431pqx1236g60if5q3xyxpv4h14smkd45dfzsa6aqjm"))))
-    (arguments `(#:skip-build? #t))))
+        (base32 "0469vp0q9431pqx1236g60if5q3xyxpv4h14smkd45dfzsa6aqjm"))))))
 
 (define-public rust-crc-catalog-2
   (package
-- 
2.41.0

Message #59 received at 68115 <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: 68115 <at> debbugs.gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH 12/18] gnu: rust-bugreport-0.4: Update to 0.4.1.
Date: Fri, 29 Dec 2023 19:40:23 -0500

* gnu/packages/crates-io.scm (rust-bugreport-0.4): Update to 0.4.1.
[arguments]: Allow building.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3a085c1674..d98a0e5989 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -8522,20 +8522,18 @@ (define-public rust-bugreport-0.4
   (package
     (inherit rust-bugreport-0.5)
     (name "rust-bugreport")
-    (version "0.4.0")
+    (version "0.4.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "bugreport" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0gday6f2brqgzl12a0vf7fx1hh1mim6gdjxc6dfwk9v4i19pxsd0"))))
+        (base32 "0k20nbl226kni905sy3rvizl7k4h28971143qdlzwfznnjrb8500"))))
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-git-version" ,rust-git-version-0.3)
-        ("rust-shell-escape" ,rust-shell-escape-0.1)
-        ("rust-sys-info" ,rust-sys-info-0.9))))))
+     `(#:cargo-inputs (("rust-git-version" ,rust-git-version-0.3)
+                       ("rust-shell-escape" ,rust-shell-escape-0.1)
+                       ("rust-sys-info" ,rust-sys-info-0.9))))))
 
 (define-public rust-build-const-0.2
   (package
-- 
2.41.0

Message #62 received at 68115 <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: 68115 <at> debbugs.gnu.org
Cc: efraim <at> flashner.co.il, jaeme <at> runbox.com
Subject: Re: [PATCH 18/18] gnu: bat: Update to 0.24.0.
Date: Sat, 30 Dec 2023 16:36:33 -0500

The issue with the manual could most likely be solved with the 
`substitute` procedure by replacing the instances of 
`{{PROJECT_EXECUTABLE}}` and `{{PROJECT_EXECUTABLE_UPPERCASE}}` with 
`bat` and `BAT` respectively.

Message #65 received at 68115 <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: 68115 <at> debbugs.gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH v2REVISION 18/18] gnu: bat: Update to 0.24.0.
Date: Sat, 30 Dec 2023 18:40:39 -0500

* gnu/packages/rust-apps.scm (bat): Update to 0.24.0.
[arguments]: Add 'install-extras step for completions and manpage.

Change-Id: Ibcd82fbd297fb84ab265486694126aed77862dd8
---
 gnu/packages/rust-apps.scm | 91 +++++++++++++++++++++++++++-----------
 1 file changed, 65 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index df731d4b61..09c41bfe61 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -78,6 +78,7 @@ (define-module (gnu packages rust-apps)
   #:use-module (gnu packages kde)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages networking)
+  #:use-module (gnu packages shells)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
@@ -213,59 +214,97 @@ (define-public alfis
 (define-public bat
   (package
     (name "bat")
-    (version "0.20.0")
+    (version "0.24.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "bat" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "05sj0chxpai26fhk1k7p5m54v3j7n1x64ayx53mcimsj1skdr77m"))))
+        (base32 "11nc2iv2qhd1bs16yijqq934864ybnmg485rny70scy26xb9xk4x"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-ansi-colours" ,rust-ansi-colours-1)
-        ("rust-ansi-term" ,rust-ansi-term-0.12)
-        ("rust-atty" ,rust-atty-0.2)
+     (list
+      #:install-source? #f
+      #:cargo-inputs
+      `(("rust-ansi-colours" ,rust-ansi-colours-1)
         ("rust-bincode" ,rust-bincode-1)
-        ("rust-bugreport" ,rust-bugreport-0.4)
+        ("rust-bugreport" ,rust-bugreport-0.5)
         ("rust-bytesize" ,rust-bytesize-1)
-        ("rust-clap" ,rust-clap-2)
-        ("rust-clap" ,rust-clap-2)
-        ("rust-clircle" ,rust-clircle-0.3)
+        ("rust-clap" ,rust-clap-4)
+        ("rust-clircle" ,rust-clircle-0.4)
         ("rust-console" ,rust-console-0.15)
         ("rust-content-inspector" ,rust-content-inspector-0.2)
-        ("rust-dirs-next" ,rust-dirs-next-2)
-        ("rust-encoding" ,rust-encoding-0.2)
+        ("rust-encoding-rs" ,rust-encoding-rs-0.8)
+        ("rust-etcetera" ,rust-etcetera-0.8)
         ("rust-flate2" ,rust-flate2-1)
-        ("rust-git2" ,rust-git2-0.13)
+        ("rust-git2" ,rust-git2-0.18)
         ("rust-globset" ,rust-globset-0.4)
         ("rust-grep-cli" ,rust-grep-cli-0.1)
+        ("rust-home" ,rust-home-0.5)
+        ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.49)
         ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-os-str-bytes" ,rust-os-str-bytes-6.4)
         ("rust-path-abs" ,rust-path-abs-0.5)
+        ("rust-plist" ,rust-plist-1)
         ("rust-regex" ,rust-regex-1)
+        ("rust-run-script" ,rust-run-script-0.10)
         ("rust-semver" ,rust-semver-1)
         ("rust-serde" ,rust-serde-1)
-        ("rust-serde-yaml" ,rust-serde-yaml-0.8)
+        ("rust-serde-yaml" ,rust-serde-yaml-0.9)
         ("rust-shell-words" ,rust-shell-words-1)
-        ("rust-syntect" ,rust-syntect-4)
+        ("rust-syntect" ,rust-syntect-5)
         ("rust-thiserror" ,rust-thiserror-1)
         ("rust-unicode-width" ,rust-unicode-width-0.1)
         ("rust-walkdir" ,rust-walkdir-2)
         ("rust-wild" ,rust-wild-2))
-       #:cargo-development-inputs
-       (("rust-assert-cmd" ,rust-assert-cmd-2)
-        ("rust-nix" ,rust-nix-0.23)
-        ("rust-predicates" ,rust-predicates-2)
-        ("rust-serial-test" ,rust-serial-test-0.5)
+      #:cargo-development-inputs
+      `(("rust-assert-cmd" ,rust-assert-cmd-2)
+        ("rust-expect-test" ,rust-expect-test-1)
+        ("rust-nix" ,rust-nix-0.26)
+        ("rust-predicates" ,rust-predicates-3)
+        ("rust-serial-test" ,rust-serial-test-2)
         ("rust-tempfile" ,rust-tempfile-3)
-        ("rust-wait-timeout" ,rust-wait-timeout-0.2))))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list libgit2 zlib))
+        ("rust-wait-timeout" ,rust-wait-timeout-0.2))
+      #: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")))
+                (mkdir-p bash-completions-dir)
+                (mkdir-p zsh-completions-dir)
+                (mkdir-p fish-completions-dir)
+                (copy-file "assets/completions/bat.bash.in"
+                           (string-append bash-completions-dir "/bat"))
+                (copy-file "assets/completions/bat.zsh.in"
+                           (string-append zsh-completions-dir "/_bat"))
+                (copy-file "assets/completions/bat.fish.in"
+                           (string-append fish-completions-dir
+                                          "/bat.fish"))
+                (rename-file "assets/manual/bat.1.in" "assets/manual/bat.1")
+                (substitute* "assets/manual/bat.1"
+                  (("\\{\\{PROJECT_EXECUTABLE\\}\\}")
+                   "bat"))
+                (substitute* "assets/manual/bat.1"
+                  (("\\{\\{PROJECT_EXECUTABLE_UPPERCASE\\}\\}")
+                   "BAT"))
+                (install-file "assets/manual/bat.1" man1)))))))
+    (native-inputs (list pkg-config))
+    (inputs (list libgit2-1.7 zlib))
     (home-page "https://github.com/sharkdp/bat")
-    (synopsis "@command{cat} clone with syntax highlighting and git integration")
+    (synopsis
+     "@command{cat} clone with syntax highlighting and git integration")
     (description
      "@command{bat} is a drop-in @command{cat} replacement featuring syntax
 highlighting for a large number of languages, git integration, and automatic

base-commit: 5844d18a8905ee3f62ccefe084dce4de61288fbf
prerequisite-patch-id: 4e9282c600240779ce2a474fc71b67e63e094dac
prerequisite-patch-id: 77c79a811fb7d80a45efe963207001573195d3f8
prerequisite-patch-id: 7ebdd534917c54094fe9f7172978c9f9df907add
prerequisite-patch-id: aff6d79885e3b9ebead360cc26e9a52b1cc3466c
prerequisite-patch-id: d3220675d7c32b8d83cf07a8086e52ab2e123f84
prerequisite-patch-id: 9660ef1508a93c6dc01d7a0caca8d9f16d97097a
prerequisite-patch-id: 01db30d9403d97de5c47c3f23c697993f5c670ff
prerequisite-patch-id: 615ac8fbe3d2d8f512a1e7999877612d4d59ea2e
prerequisite-patch-id: f53f9ca86cb5b0f5d2b5113ebb9e174421126530
prerequisite-patch-id: 3d05f5d8bc7dc720df420e11d19e7656f7164d30
prerequisite-patch-id: 0029e0e6b95b1882b8094edab798661d711de74a
prerequisite-patch-id: 7c654bde97ad56b88ef767d45c50240eb25fecc9
prerequisite-patch-id: 66e47e99eca9a7658f235489a770933d0c38717f
prerequisite-patch-id: 48d3773ce58200a823d1ebf627748b21612c07c1
prerequisite-patch-id: a6a36b297ad3f64fe45afc28b0630c01fa012c0f
prerequisite-patch-id: 9bf8f614a803af449ff9db439155ce1c741abf3b
prerequisite-patch-id: 53d2035fd294e910771e688a752dfb2fdca83afd
--
2.41.0

Message #70 received at 68115-done <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: Jaeme Sifat <jaeme <at> runbox.com>
Cc: 68115-done <at> debbugs.gnu.org
Subject: Re: [bug#68115] [PATCH 00/18 rust-team] rust-apps: bat: Update to 0.24
Date: Tue, 2 Jan 2024 11:39:25 +0200

[Message part 1 (text/plain, inline)]

On Fri, Dec 29, 2023 at 07:05:03PM -0500, Jaeme Sifat wrote:
> This patchset updates bat, the cat clone, to 0.24 as well as refactoring any
> package definitions along the way.
> 
> bat has a really peculiar way to packaging its extra files (completions +
> manual). Mainly, this results in bat.1 not having the correct project
> exectuable name instead using the placeholder.
> 
> If you can find a solution to this, I'll be glad to hear it. Not even nixpkgs
> packages the extra files.

My secret to finding this is to check the .github folder to see what
they use for CI. Between that and reading the build.rs I learned that if
BAT_ASSETS_GEN_DIR or OUT_DIR is set then the generated assets will go
in that directory. I adjusted the custom phase(s) accordingly to
generate them and then install those files.

I really appreciated your attention to the descriptions for the
packages, some of them were much much better than what upstream had.

Patches added to the rust-team branch!

-- 
Efraim Flashner   <efraim <at> 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

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.