[PATCH 00/11 rust-team] gnu: Add git-delta.

  • Done
  • quality assurance status badge
Details
2 participants
  • Efraim Flashner
  • Jaeme Sifat
Owner
unassigned
Submitted by
Jaeme Sifat
Severity
normal
J
J
Jaeme Sifat wrote on 6 Jan 05:50 +0100
(address . guix-patches@gnu.org)(name . Jaeme Sifat)(address . jaeme@runbox.com)
20240106045012.683991-1-jaeme@runbox.com
Notables:

:: Changed rust-bat to be a unique library instead of a binary.

:: Added exact version rust-bytelines-2.2 and version 2 as well.

:: Updated some crates and allowed building.

:: git-delta requires mdbook to build a special manual? Thoughts on packaging
mdbook and having that be a manual since no apparent manpage is provided (at
least from what I could gleam, please correct me if I'm wrong).

Jaeme Sifat (11):
gnu: Add rust-sysinfo-0.28.
gnu: rust-smol-str-0.1: Update to 0.1.24.
gnu: Add rust-palette-derive-0.6.
gnu: Add rust-palette-0.6.
gnu: rust-chrono-humanize-0.2: Update to 0.2.3.
gnu: Add rust-bytelines-2.2.
gnu: Add rust-bytelines-2.
gnu: Add rust-bat-0.22.
gnu: rust-bat-0.18: Refactor package as library.
gnu: Add rust-box-drawing-0.1.
gnu: Add git-delta.

gnu/packages/crates-graphics.scm | 73 +++++++++++-
gnu/packages/crates-io.scm | 190 +++++++++++++++++++++++++------
gnu/packages/rust-apps.scm | 87 +++++++++++++-
3 files changed, 311 insertions(+), 39 deletions(-)


base-commit: d15ee33955b704a5eb43ddb6535ae1a38034884a
--
2.41.0
J
J
Jaeme Sifat wrote on 6 Jan 05:52 +0100
[PATCH 04/11] gnu: Add rust-palette-0.6.
(address . 68275@debbugs.gnu.org)(name . Jaeme Sifat)(address . jaeme@runbox.com)
142689f81576f85456c0b3e6fcae9539eb78c248.1704516729.git.jaeme@runbox.com
* gnu/packages/crates-graphics.scm (rust-palette-0.6): New variable.

Change-Id: I0c5e982730c533a38dbae133d015d3f71d77c892
---
gnu/packages/crates-graphics.scm | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)

Toggle diff (45 lines)
diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 9062670c10..65e1171fbc 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2513,6 +2513,38 @@ (define-public rust-palette-0.7
on correctness, flexibility and ease of use.")
(license (list license:expat license:asl2.0))))
+(define-public rust-palette-0.6
+ (package
+ (inherit rust-palette-0.7)
+ (name "rust-palette")
+ (version "0.6.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "palette" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0jay4zbxfnz6hj9f78inb3n3hmaamivnrrapy4ri0n0jf67xd74g"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-approx" ,rust-approx-0.5)
+ ("rust-bytemuck" ,rust-bytemuck-1)
+ ("rust-num-traits" ,rust-num-traits-0.2)
+ ("rust-palette-derive" ,rust-palette-derive-0.6)
+ ("rust-phf" ,rust-phf-0.11)
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-serde" ,rust-serde-1))
+ #:cargo-development-inputs
+ (("rust-clap" ,rust-clap-2)
+ ("rust-criterion" ,rust-criterion-0.3)
+ ("rust-csv" ,rust-csv-1)
+ ("rust-image" ,rust-image-0.23)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-rand-mt" ,rust-rand-mt-4)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-derive" ,rust-serde-derive-1)
+ ("rust-serde-json" ,rust-serde-json-1))))))
+
(define-public rust-palette-derive-0.7
(package
(name "rust-palette-derive")
--
2.41.0
J
J
Jaeme Sifat wrote on 6 Jan 05:52 +0100
[PATCH 02/11] gnu: rust-smol-str-0.1: Update to 0.1.24.
(address . 68275@debbugs.gnu.org)(name . Jaeme Sifat)(address . jaeme@runbox.com)
ec7e0071a1ff9d7169d52ca877a5cce895e17f11.1704516729.git.jaeme@runbox.com
* gnu/packages/crates-io.scm (rust-smol-str-0.1): Update to 0.1.24.
[arguments]: Allow building using rust-smol-str-0.2's arguments.

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

Toggle diff (31 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d0a424b59b..a4d9d4763b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -67043,22 +67043,14 @@ (define-public rust-smol-str-0.1
(package
(inherit rust-smol-str-0.2)
(name "rust-smol-str")
- (version "0.1.21")
+ (version "0.1.24")
(source
(origin
(method url-fetch)
(uri (crate-uri "smol_str" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1gb14a85k6mzpn6s78flwvfl5vy1czsrzlwcgidy7k00wf1mrlb1"))))
- (arguments
- `(#:skip-build? #t
- #:cargo-inputs
- (("rust-serde" ,rust-serde-1))
- #:cargo-development-inputs
- (("rust-proptest" ,rust-proptest-0.10)
- ("rust-serde" ,rust-serde-1)
- ("rust-serde-json" ,rust-serde-json-1))))))
+ (base32 "1j891lgnflvnzgbs7fhwd6sxrrx47ii5mj0yy3f2f9mbrdbwimps"))))))
(define-public rust-snafu-derive-0.7
(package
--
2.41.0
J
J
Jaeme Sifat wrote on 6 Jan 05:52 +0100
[PATCH 05/11] gnu: rust-chrono-humanize-0.2: Update to 0.2.3.
(address . 68275@debbugs.gnu.org)(name . Jaeme Sifat)(address . jaeme@runbox.com)
4dea0dadcc2304e7a5eedb56fb88c3cf53753054.1704516729.git.jaeme@runbox.com
* gnu/packages/crates-io.scm (rust-chrono-humanize-0.2): Update to 0.2.3.
[arguments]: Allow building.
[description]: Update description.

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

Toggle diff (36 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a4d9d4763b..ccf2672f3c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11117,7 +11117,7 @@ (define-public rust-chrono-0.4
(define-public rust-chrono-humanize-0.2
(package
(name "rust-chrono-humanize")
- (version "0.2.1")
+ (version "0.2.3")
(source
(origin
(method url-fetch)
@@ -11125,17 +11125,16 @@ (define-public rust-chrono-humanize-0.2
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1jvm6fcs3zvz4kcqkp9q5hjy0i2zc17194nb63ckyn0xa0cw3p9f"))))
+ (base32 "0fq25fcdqd7s39dx81hq123210q4lpcbjdz82jl2fy6jnkk2g5kr"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-chrono" ,rust-chrono-0.4))))
(home-page "https://gitlab.com/imp/chrono-humanize-rs")
(synopsis "Human-friendly time expressions")
(description
"Chrono-Humanize provides human-friendly time expressions, similar to
-Python arrow.humanize.")
+Python @code{arrow.humanize}.")
(license (list license:expat license:asl2.0))))
(define-public rust-chrono-tz-0.6
--
2.41.0
J
J
Jaeme Sifat wrote on 6 Jan 05:52 +0100
[PATCH 01/11] gnu: Add rust-sysinfo-0.28.
(address . 68275@debbugs.gnu.org)(name . Jaeme Sifat)(address . jaeme@runbox.com)
7d7fb9f04f269133309da4ccc16c235443d8759a.1704516728.git.jaeme@runbox.com
* gnu/packages/crates-io.scm (rust-sysinfo-0.28): New variable.

Change-Id: Iece357b663a637b4e58c9900ecefcffc70b53fed
---
gnu/packages/crates-io.scm | 53 +++++++++++++++++++++++++++++++-------
1 file changed, 44 insertions(+), 9 deletions(-)

Toggle diff (89 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f659f8ef1e..d0a424b59b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33,7 +33,7 @@
;;; Copyright © 2022 Paul Alesius <paul@unnservice.com>
;;; Copyright © 2023 Arnav Andrew Jose <arnav.jose@gmail.com>
;;; Copyright © 2023 Wilko Meyer <w@wmeyer.eu>
-;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
+;;; Copyright © 2023, 2024 Jaeme Sifat <jaeme@runbox.com>
;;; Copyright © 2023 Steve George <steve@futurile.net>
;;; Copyright © 2023 Sergio Pastor Pérez <sergio.pastorperez@outlook.es>
;;; Copyright © 2023 VÖRÖSK?I András <voroskoi@gmail.com>
@@ -71462,8 +71462,49 @@ (define-public rust-sysctl-0.1
("rust-errno" ,rust-errno-0.2)
("rust-libc" ,rust-libc-0.2))))))
+(define-public rust-sysinfo-0.28
+ (package
+ (name "rust-sysinfo")
+ (version "0.28.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "sysinfo" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "06zk8awy8gjrk3w68wpkqyprm3j82vq1cibji6db5zlkcv5g7hml"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-test-flags
+ (list "--release" "--"
+ ;; These files aren't available in the build environment.
+ "--skip=test::check_system_info"
+ "--skip=test::check_uid_gid"
+ "--skip=test_networks"
+ "--skip=test_wait_non_child"
+ "--skip=test_process_disk_usage")
+ #:cargo-inputs
+ (("rust-cfg-if" ,rust-cfg-if-1)
+ ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-ntapi" ,rust-ntapi-0.4)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-rayon" ,rust-rayon-1)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-winapi" ,rust-winapi-0.3))
+ #:cargo-development-inputs
+ (("rust-serde-json" ,rust-serde-json-1)
+ ("rust-tempfile" ,rust-tempfile-3))))
+ (home-page "https://github.com/GuillaumeGomez/sysinfo")
+ (synopsis "System handler to interact with processes")
+ (description
+ "This package is a library to get system information such as processes,
+processors, disks, components and networks.")
+ (license license:expat)))
+
(define-public rust-sysinfo-0.27
(package
+ (inherit rust-sysinfo-0.28)
(name "rust-sysinfo")
(version "0.27.8")
(source (origin
@@ -71473,7 +71514,6 @@ (define-public rust-sysinfo-0.27
(sha256
(base32
"0cqy39g76298pqfr8jv30j6cxl9bpnd7c2smfxl5s2na1w2yj0m9"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-test-flags
(list "--release" "--"
@@ -71491,13 +71531,8 @@ (define-public rust-sysinfo-0.27
("rust-once-cell" ,rust-once-cell-1)
("rust-rayon" ,rust-rayon-1)
("rust-winapi" ,rust-winapi-0.3))
- #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3))))
- (home-page "https://github.com/GuillaumeGomez/sysinfo")
- (synopsis "System handler to interact with processes")
- (description
- "This package is a library to get system information such as processes,
-processors, disks, components and networks.")
- (license license:expat)))
+ #:cargo-development-inputs
+ (("rust-tempfile" ,rust-tempfile-3))))))
(define-public rust-sysinfo-0.15
(package
--
2.41.0
J
J
Jaeme Sifat wrote on 6 Jan 05:52 +0100
[PATCH 06/11] gnu: Add rust-bytelines-2.2.
(address . 68275@debbugs.gnu.org)(name . Jaeme Sifat)(address . jaeme@runbox.com)
3397f41df0d86407f379e1f0cbcfdde86e7a1e1f.1704516729.git.jaeme@runbox.com
* gnu/packages/crates-io.scm (rust-bytelines-2.2): New variable.

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

Toggle diff (32 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ccf2672f3c..6f12bde8f6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -8870,6 +8870,25 @@ (define-public rust-bytecount-0.4
("rust-quickcheck" ,rust-quickcheck-0.6)
("rust-rand" ,rust-rand-0.4))))))
+(define-public rust-bytelines-2.2
+ (package
+ (name "rust-bytelines")
+ (version "2.2.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "bytelines" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0pv1dwbbqws84v31f64g6b3nxi0jbhi59cipwpg6651ys504w7kr"))))
+ (build-system cargo-build-system)
+ (home-page "https://github.com/whitfin/bytelines")
+ (synopsis "Read input lines as byte slices for high efficiency")
+ (description
+ "This library provides an easy way to read in input lines as byte slices for
+high efficiency.")
+ (license license:expat)))
+
(define-public rust-bytemuck-1
(package
(name "rust-bytemuck")
--
2.41.0
J
J
Jaeme Sifat wrote on 6 Jan 05:52 +0100
[PATCH 03/11] gnu: Add rust-palette-derive-0.6.
(address . 68275@debbugs.gnu.org)(name . Jaeme Sifat)(address . jaeme@runbox.com)
41e7f7384b049f26b06428fee8960e71e1411b36.1704516729.git.jaeme@runbox.com
* gnu/packages/crates-graphics.scm (rust-palette-derive-0.6): New variable.

Change-Id: Ia6a5ab81fb74278d05fa5a78430a5b2d40062c91
---
gnu/packages/crates-graphics.scm | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)

Toggle diff (41 lines)
diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index b5247bde89..9062670c10 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -13,7 +13,7 @@
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
-;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
+;;; Copyright © 2023, 2024 Jaeme Sifat <jaeme@runbox.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -2536,6 +2536,25 @@ (define-public rust-palette-derive-0.7
@code{palette} crate.")
(license (list license:expat license:asl2.0))))
+(define-public rust-palette-derive-0.6
+ (package
+ (inherit rust-palette-derive-0.7)
+ (name "rust-palette-derive")
+ (version "0.6.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "palette_derive" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "09z4nd4sbmzqd1pqr48vrdca3v2c03dzr70cmxs7zhp7m13dzvh5"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-find-crate" ,rust-find-crate-0.6)
+ ("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))))))
+
(define-public rust-pbr-1
(package
(name "rust-pbr")
--
2.41.0
J
J
Jaeme Sifat wrote on 6 Jan 05:52 +0100
[PATCH 07/11] gnu: Add rust-bytelines-2.
(address . 68275@debbugs.gnu.org)(name . Jaeme Sifat)(address . jaeme@runbox.com)
85ac3b94e68e381890df137df60a2694a6a0ea31.1704516729.git.jaeme@runbox.com
* gnu/packages/crates-io.scm (rust-bytelines-2): New variable.
* gnu/packages/crates-io.scm (rust-bytelines-2.2): Inherit from
rust-bytelines-2.

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

Toggle diff (56 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6f12bde8f6..97ccb82d59 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -8870,18 +8870,24 @@ (define-public rust-bytecount-0.4
("rust-quickcheck" ,rust-quickcheck-0.6)
("rust-rand" ,rust-rand-0.4))))))
-(define-public rust-bytelines-2.2
+(define-public rust-bytelines-2
(package
(name "rust-bytelines")
- (version "2.2.2")
+ (version "2.5.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "bytelines" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0pv1dwbbqws84v31f64g6b3nxi0jbhi59cipwpg6651ys504w7kr"))))
+ (base32 "1jxacxpb7v0qgh325s5b7mfk90fr63jpr90dar8m47r27imnb5qj"))))
(build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-futures-util" ,rust-futures-util-0.3)
+ ("rust-tokio" ,rust-tokio-1))
+ #:cargo-development-inputs
+ (("rust-tokio" ,rust-tokio-1))))
(home-page "https://github.com/whitfin/bytelines")
(synopsis "Read input lines as byte slices for high efficiency")
(description
@@ -8889,6 +8895,21 @@ (define-public rust-bytelines-2.2
high efficiency.")
(license license:expat)))
+(define-public rust-bytelines-2.2
+ (package
+ (inherit rust-bytelines-2)
+ (name "rust-bytelines")
+ (version "2.2.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "bytelines" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0pv1dwbbqws84v31f64g6b3nxi0jbhi59cipwpg6651ys504w7kr"))))
+ (build-system cargo-build-system)
+ (arguments '())))
+
(define-public rust-bytemuck-1
(package
(name "rust-bytemuck")
--
2.41.0
J
J
Jaeme Sifat wrote on 6 Jan 05:52 +0100
[PATCH 11/11] gnu: Add git-delta.
(address . 68275@debbugs.gnu.org)(name . Jaeme Sifat)(address . jaeme@runbox.com)
a25739c23600e136dde7745a9d34b3aab03dcf00.1704516729.git.jaeme@runbox.com
* gnu/packages/rust-apps.scm (git-delta): New variable.

Change-Id: I2319ab35b01842cb66b88df13fa64f31de4f20e5
---
gnu/packages/rust-apps.scm | 87 +++++++++++++++++++++++++++++++++++++-
1 file changed, 86 insertions(+), 1 deletion(-)

Toggle diff (107 lines)
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 6a224762a8..70d7cbfbb8 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -25,7 +25,7 @@
;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
;;; Copyright © 2023 Arnav Andrew Jose <arnav.jose@gmail.com>
;;; Copyright © 2023 Wilko Meyer <w@wmeyer.eu>
-;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
+;;; Copyright © 2023, 2024 Jaeme Sifat <jaeme@runbox.com>
;;; Copyright © 2023 Steve George <steve@futurile.net>
;;;
;;; This file is part of GNU Guix.
@@ -2532,6 +2532,91 @@ (define-public git-absorb
It will then write @code{fixup!} commits for each of those changes.")
(license license:bsd-3)))
+(define-public git-delta
+ (package
+ (name "git-delta")
+ (version "0.16.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "git-delta" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1pvy5jcpj3xzf2b8k9d5xwwamwlv9pzsx6p2yq61am38igafg9qb"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:install-source? #f
+ #:cargo-inputs
+ `(("rust-ansi-colours" ,rust-ansi-colours-1)
+ ("rust-ansi-term" ,rust-ansi-term-0.12)
+ ("rust-anyhow" ,rust-anyhow-1)
+ ("rust-atty" ,rust-atty-0.2)
+ ("rust-bat" ,rust-bat-0.22)
+ ("rust-bitflags" ,rust-bitflags-2)
+ ("rust-box-drawing" ,rust-box-drawing-0.1)
+ ("rust-bytelines" ,rust-bytelines-2.2)
+ ("rust-chrono" ,rust-chrono-0.4)
+ ("rust-chrono-humanize" ,rust-chrono-humanize-0.2)
+ ("rust-clap" ,rust-clap-4)
+ ("rust-console" ,rust-console-0.15)
+ ("rust-ctrlc" ,rust-ctrlc-3)
+ ("rust-dirs" ,rust-dirs-4)
+ ("rust-git2" ,rust-git2-0.16)
+ ("rust-grep-cli" ,rust-grep-cli-0.1)
+ ("rust-itertools" ,rust-itertools-0.10)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-palette" ,rust-palette-0.6)
+ ("rust-pathdiff" ,rust-pathdiff-0.2)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-shell-words" ,rust-shell-words-1)
+ ("rust-smol-str" ,rust-smol-str-0.1)
+ ("rust-syntect" ,rust-syntect-5)
+ ("rust-sysinfo" ,rust-sysinfo-0.28)
+ ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)
+ ("rust-unicode-width" ,rust-unicode-width-0.1)
+ ("rust-vte" ,rust-vte-0.11)
+ ("rust-xdg" ,rust-xdg-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")))
+ (mkdir-p bash-completions-dir)
+ (mkdir-p zsh-completions-dir)
+ (mkdir-p fish-completions-dir)
+ (copy-file "etc/completion/completion.bash"
+ (string-append bash-completions-dir
+ "/delta"))
+ (copy-file "etc/completion/completion.zsh"
+ (string-append zsh-completions-dir
+ "/_delta"))
+ (copy-file "etc/completion/completion.fish"
+ (string-append fish-completions-dir
+ "/delta.fish"))))))))
+ (native-inputs (list git-minimal pkg-config))
+ (inputs (list libgit2 openssl zlib))
+ (home-page "https://github.com/dandavison/delta")
+ (synopsis "Syntax-highlighting pager for git")
+ (description
+ "This package provides a syntax-highlighting pager for @command{git}. It uses
+@command{bat} for syntax highlighting and provides many features such as advanced
+keybindings, word-level diff highlighting, syntax highlighting for @command{grep} and
+a stylized box presentation.")
+ (license license:expat)))
+
(define-public rust-xremap
(package
(name "rust-xremap")
--
2.41.0
J
J
Jaeme Sifat wrote on 6 Jan 05:52 +0100
[PATCH 10/11] gnu: Add rust-box-drawing-0.1.
(address . 68275@debbugs.gnu.org)(name . Jaeme Sifat)(address . jaeme@runbox.com)
7a1129d369b7c41e937d4fa9df3379fe04467c0f.1704516729.git.jaeme@runbox.com
* gnu/packages/crates-graphics.scm (rust-box-drawing-0.1): New variable.

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

Toggle diff (33 lines)
diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 65e1171fbc..9b0d460151 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -477,6 +477,26 @@ (define-public rust-avif-serialize-0.6
#:cargo-inputs
(("rust-arrayvec" ,rust-arrayvec-0.5))))))
+(define-public rust-box-drawing-0.1
+ (package
+ (name "rust-box-drawing")
+ (version "0.1.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "box_drawing" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0jx4rrxy4xmgmplmgl398vrng67sfl8qny7n7d91fyw6zpaxh9za"))))
+ (build-system cargo-build-system)
+ (home-page "https://gitlab.com/chronos.alfa/box_drawing.git")
+ (synopsis
+ "Simple library containing constants for UTF-8 box drawing")
+ (description
+ "This package provides a simple library containing constants for UTF-8 box
+drawing.")
+ (license license:expat)))
+
(define-public rust-cgl-0.3
(package
(name "rust-cgl")
--
2.41.0
J
J
Jaeme Sifat wrote on 6 Jan 05:52 +0100
[PATCH 09/11] gnu: rust-bat-0.18: Refactor package as library.
(address . 68275@debbugs.gnu.org)(name . Jaeme Sifat)(address . jaeme@runbox.com)
ca6cf29b5500c6dbf28254f2666764fde93dcd2b.1704516729.git.jaeme@runbox.com
* gnu/packages/crates-io.scm (rust-bat-0.18): Refactor package definition as
library.
[package]: Inherit from rust-bat-0.22.
[name]: Change to rust-bat.

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

Toggle diff (46 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3265d85588..b0e67e525b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5755,7 +5755,8 @@ (define-public rust-bat-0.22
(define-public rust-bat-0.18
(package
- (name "bat")
+ (inherit rust-bat-0.22)
+ (name "rust-bat")
(version "0.18.3")
(source
(origin
@@ -5764,9 +5765,8 @@ (define-public rust-bat-0.18
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0qlk032dd6zxda1v7clah33nafxygaw3x7f73ajwlvk956nrn1js"))))
- (build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
+ `(#:skip-build? #t ; Provided as a library not a binary.
#:cargo-inputs
(("rust-ansi-colours" ,rust-ansi-colours-1)
("rust-ansi-term" ,rust-ansi-term-0.12)
@@ -5798,17 +5798,8 @@ (define-public rust-bat-0.18
("rust-serial-test" ,rust-serial-test-0.5)
("rust-tempfile" ,rust-tempfile-3)
("rust-wait-timeout" ,rust-wait-timeout-0.2))))
- (native-inputs
- (list pkg-config))
(inputs
- (list libgit2 zlib))
- (home-page "https://github.com/sharkdp/bat")
- (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
-paging.")
- (license (list license:expat license:asl2.0))))
+ (list libgit2 zlib))))
(define-public rust-beef-0.5
(package
--
2.41.0
J
J
Jaeme Sifat wrote on 6 Jan 05:52 +0100
[PATCH 08/11] gnu: Add rust-bat-0.22.
(address . 68275@debbugs.gnu.org)(name . Jaeme Sifat)(address . jaeme@runbox.com)
68f3a797f4eb512dfd6493819da89e34fb7fe60c.1704516729.git.jaeme@runbox.com
* gnu/packages/crates-io.scm (rust-bat-0.22): New variable.

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

Toggle diff (72 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 97ccb82d59..3265d85588 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5694,6 +5694,65 @@ (define-public rust-basic-toml-0.1
dependencies.")
(license (list license:expat license:asl2.0))))
+(define-public rust-bat-0.22
+ (package
+ (name "rust-bat")
+ (version "0.22.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "bat" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0pdnbblvf2dkmnf6yybmysgmlw4j79j7c6mylcc8317h0xsymzgv"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #t ; Provided as a library not a binary.
+ #:cargo-inputs
+ (("rust-ansi-colours" ,rust-ansi-colours-1)
+ ("rust-ansi-term" ,rust-ansi-term-0.12)
+ ("rust-atty" ,rust-atty-0.2)
+ ("rust-bincode" ,rust-bincode-1)
+ ("rust-bugreport" ,rust-bugreport-0.5)
+ ("rust-bytesize" ,rust-bytesize-1)
+ ("rust-clap" ,rust-clap-3)
+ ("rust-clircle" ,rust-clircle-0.3)
+ ("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-flate2" ,rust-flate2-1)
+ ("rust-git2" ,rust-git2-0.15)
+ ("rust-globset" ,rust-globset-0.4)
+ ("rust-grep-cli" ,rust-grep-cli-0.1)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-path-abs" ,rust-path-abs-0.5)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-semver" ,rust-semver-1)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-yaml" ,rust-serde-yaml-0.8)
+ ("rust-shell-words" ,rust-shell-words-1)
+ ("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.24)
+ ("rust-predicates" ,rust-predicates-2)
+ ("rust-serial-test" ,rust-serial-test-0.6)
+ ("rust-tempfile" ,rust-tempfile-3)
+ ("rust-wait-timeout" ,rust-wait-timeout-0.2))))
+ (native-inputs (list pkg-config))
+ (inputs (list libgit2 openssl zlib))
+ (home-page "https://github.com/sharkdp/bat")
+ (synopsis "Library providing syntax highlighting for text")
+ (description
+ "This package provides the @command{bat} syntax highlighter as a library to use
+for syntax highlighting in other crates.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-bat-0.18
(package
(name "bat")
--
2.41.0
E
E
Efraim Flashner wrote on 8 Jan 19:12 +0100
Re: [bug#68275] [PATCH 11/11] gnu: Add git-delta.
(name . Jaeme Sifat)(address . jaeme@runbox.com)(address . 68275-done@debbugs.gnu.org)
ZZw7AydkgaOEcowI@3900XT
Attachment: file
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmWcOwMACgkQQarn3Mo9
g1GvhQ//cNTinueSeOJqNuYDtVXAXS4M2RADMZU1P8L+dkW1iNcjGOq8F44BInHo
pB0k3TcFTm4ol6AAX1BfGhA8smFP9kjaeWS5nRCwAOjy8lkkW3ZuKUGqYcTCG65f
6TpDDeMKvM2c+IVeJnTHP/HUfO/CIe6zsIqlIIBzRpjLhrI/oGhEI7Dc5UpAhGyJ
XRB0TkY+GCaEtOvBoUnazF9PiW1DfaQ+lecH69MAQ7gFIGndVeFNy0Uf+5EdlyiA
yrNCiIfzGwcuSSqwa2iTAewBtXfaPksC0IoOU3ilDQ30cCYJZx7eW+Z0Pp9GFglJ
8F8OkK1bUMd5tSdiPuTqTI0uao8MiA9lmiO40SifiENwwv3hV5CBBa9XeJtPuUyh
Dc4RyJDT3UdJHorpfQhz2HuZ7PSCKe/HPoJmfhsYBcRWQPq+pSqoZR8cnHekxZPe
AVcRQS9EE+vSLrgJgFxumXVfgg5RUwRuSmrJWH3SJdSurWhPhuaaV3+OF0xClpJb
M2/anbSlb6pa0ODzs+C+j93/0wJ8CObF9TYJvK5u6Bj+WKbuREEOvPTQoUGw1zj/
sxrUD5mdSG5/cxdJCaZTtBFKZy+D3RNbS5dvUHJS2FIGzK6avytkheL1YIB+6kjO
QvtZigk95aMi0N3gCopJZzHTYpG6eTCnDRG0L2d/lTvSCcDfeKI=
=RhqD
-----END PGP SIGNATURE-----


Closed
?