[bug#57448] [PATCH 0/5] gnu: exa: Update to 0.10.1.

[bug#57448] [PATCH 0/5] gnu: exa: Update to 0.10.1.

[ギャラ via Guix-patches via]

[-- Attachment #1.1: Type: text/plain, Size: 581 bytes --]

Hello,

This patch update exa to 0.10.1. Add pandoc as a native input to make 
man pages.

gyara (5):
       gnu: Add rust-number-prefix 0.4.0
       gnu: rust-iso8601: Update to 0.3
       gnu: rust-datetime: Update to 0.5.2
       gnu: rust-zoneinfo-compiled: Update to 0.5.1.
       gnu: exa: Update to 0.10.1

gnu/packages/crates-io.scm |  88 +++++++++++----------
gnu/packages/rust-apps.scm | 143 +++++++++++++++--------------------
2 files changed, 109 insertions(+), 122 deletions(-)

-- 
存在するということは、自分を创造することだ。

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#57448] [PATCH 1/5] gnu: Add rust-number-prefix 0.4.0

[gyara via Guix-patches via]

---
There are still other packages deps on rust-number-prefix-0.3

 gnu/packages/crates-io.scm | 39 +++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7c5850791d..e446c6dddb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -39109,27 +39109,36 @@ (define-public rust-num-traits-0.1
      `(#:cargo-inputs
        (("rust-num-traits" , rust-num-traits-0.2))))))
 
-(define-public rust-number-prefix-0.3
+(define-public rust-number-prefix-0.4
   (package
     (name "rust-number-prefix")
-    (version "0.3.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "number_prefix" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0slm4mqmpgs6hvz22ycny9lvyvl9ivs80a1lncslp7lszz02zc0p"))))
+    (version "0.4.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "number-prefix" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1wvh13wvlajqxkb1filsfzbrnq0vrmrw298v2j3sy82z1rm282w3"))))
     (build-system cargo-build-system)
     (home-page "https://github.com/ogham/rust-number-prefix")
-    (synopsis "Format numeric prefixes: kilo, giga, kibi")
-    (description
-     "This package provides a library for formatting numeric prefixes: kilo,
-giga, kibi.")
+    (synopsis "Library for numeric prefixes (kilo, giga, kibi).")
+    (description "Library for numeric prefixes (kilo, giga, kibi).")
     (license license:expat)))
 
+(define-public rust-number-prefix-0.3
+  (package
+    (inherit rust-number-prefix-0.4)
+    (name "rust-number-prefix")
+    (version "0.3.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "number_prefix" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0slm4mqmpgs6hvz22ycny9lvyvl9ivs80a1lncslp7lszz02zc0p"))))))
+
 (define-public rust-numtoa-0.1
   (package
     (name "rust-numtoa")
-- 
2.37.2

[bug#57448] [PATCH 2/5] gnu: rust-iso8601: Update to 0.3

[gyara via Guix-patches via]

---
No other packages deps on this.

 gnu/packages/crates-io.scm | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e446c6dddb..8a99662703 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -29788,24 +29788,21 @@ (define-public rust-is-executable-1
 whether or not a given path points to an executable file.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-iso8601-0.1
+(define-public rust-iso8601-0.3
   (package
     (name "rust-iso8601")
-    (version "0.1.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "iso8601" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0xy48qyfmirslaj4dy6n4g8b564jap3cjiql35fmj5vgii7ldp0i"))))
+    (version "0.3.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "iso8601" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0vvn6f9gv2295ik77nvaz99wzbwz1bmasrd787sz6d9mlwa6ks23"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-clippy" ,rust-clippy-0.0)
-        ("rust-nom" ,rust-nom-1))))
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-nom" ,rust-nom-4))))
     (home-page "https://github.com/badboy/iso8601")
     (synopsis "Parsing ISO8601 dates using nom")
     (description "Parsing ISO8601 dates using nom.")
-- 
2.37.2

[bug#57448] [PATCH 3/5] gnu: rust-datetime: Update to 0.5.2

[gyara via Guix-patches via]

---
No other packages deps on rust-datetime-0.4

 gnu/packages/crates-io.scm | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8a99662703..8220f20772 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -16511,10 +16511,10 @@ (define-public rust-data-url-0.1
      "Processing of data: URL according to WHATWG's Fetch Standard.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-datetime-0.4
+(define-public rust-datetime-0.5
   (package
     (name "rust-datetime")
-    (version "0.4.7")
+    (version "0.5.2")
     (source
       (origin
         (method url-fetch)
@@ -16523,18 +16523,17 @@ (define-public rust-datetime-0.4
          (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "1fd74bq48xg8ki5yw1mr1pa5hd3j5lbk4iqc5r0kh3l62b0vci2w"))))
+          "1g2lhc2ay46njrnnyc0729ibyzkpv3r3d4g0h3gzwmrygykzghs4"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-        (("rust-iso8601" ,rust-iso8601-0.1)
-         ("rust-kernel32-sys" ,rust-kernel32-sys-0.2)
+        (("rust-iso8601" ,rust-iso8601-0.3)
          ("rust-libc" ,rust-libc-0.2)
          ("rust-locale" ,rust-locale-0.2)
-         ("rust-num-traits" ,rust-num-traits-0.1)
+         ("rust-num-traits" ,rust-num-traits-0.2)
          ("rust-pad" ,rust-pad-0.1)
          ("rust-redox-syscall" ,rust-redox-syscall-0.1)
-         ("rust-winapi" ,rust-winapi-0.2))
+         ("rust-winapi" ,rust-winapi-0.3))
         #:cargo-development-inputs
         (("rust-regex" ,rust-regex-0.1)
          ("rust-rustc-serialize" ,rust-rustc-serialize-0.3))))
-- 
2.37.2

[bug#57448] [PATCH 4/5] gnu: rust-zoneinfo-compiled: Update to 0.5.1.

[gyara via Guix-patches via]

---
No Other packages deps on rust-zoneinfo-compiled-0.4

 gnu/packages/crates-io.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8220f20772..c7eae13555 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -72868,10 +72868,10 @@ (define-public rust-zip-0.5
      "Library to support the reading and writing of zip files.")
     (license license:expat)))
 
-(define-public rust-zoneinfo-compiled-0.4
+(define-public rust-zoneinfo-compiled-0.5
   (package
     (name "rust-zoneinfo-compiled")
-    (version "0.4.8")
+    (version "0.5.1")
     (source
       (origin
         (method url-fetch)
@@ -72880,12 +72880,13 @@ (define-public rust-zoneinfo-compiled-0.4
          (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "0bnm19w791q6kp79s0zl1cj9w51bw5xrifrxfy3g1p05i676y4vf"))))
+          "1pm50w4vv34r08mrajfvyhc1254gv8zv4q6p7gs315c9bvkfpyv4"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#:skip-build? #t
+       #:cargo-inputs
        (("rust-byteorder" ,rust-byteorder-1)
-        ("rust-datetime" ,rust-datetime-0.4))))
+        ("rust-datetime" ,rust-datetime-0.5))))
     (home-page "https://github.com/rust-datetime/zoneinfo-compiled/")
     (synopsis "Library for parsing compiled zoneinfo files")
     (description
-- 
2.37.2

[bug#57448] [PATCH 5/5] gnu: exa: Update to 0.10.1

[gyara via Guix-patches via]

---
Add pandoc to build manual. All test works now, so delete code that
disable them.

 gnu/packages/rust-apps.scm | 143 ++++++++++++++++---------------------
 1 file changed, 62 insertions(+), 81 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 0d5034ffb7..d570ec1848 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -50,6 +50,7 @@ (define-module (gnu packages rust-apps)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages haskell-xyz)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages ibus)
@@ -362,91 +363,71 @@ (define-public dutree
 (define-public exa
   (package
     (name "exa")
-    (version "0.9.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "exa" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1s902xgplz1167k0r7x235p914lprpsqy2if0kpa1mlb0fswqqq4"))))
+    (version "0.10.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "exa" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1dd7waq2bnxc1xwygqphi8k1g2qzykr6fk0q4rgrhhxp2jd09f04"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-ansi-term" ,rust-ansi-term-0.12)
-        ("rust-datetime" ,rust-datetime-0.4)
-        ("rust-env-logger" ,rust-env-logger-0.6)
-        ("rust-git2" ,rust-git2-0.9)
-        ("rust-glob" ,rust-glob-0.3)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-locale" ,rust-locale-0.2)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-natord" ,rust-natord-1)
-        ("rust-num-cpus" ,rust-num-cpus-1)
-        ("rust-number-prefix" ,rust-number-prefix-0.3)
-        ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1)
-        ("rust-term-grid" ,rust-term-grid-0.1)
-        ("rust-term-size" ,rust-term-size-0.3)
-        ("rust-unicode-width" ,rust-unicode-width-0.1)
-        ("rust-users" ,rust-users-0.9)
-        ("rust-zoneinfo-compiled" ,rust-zoneinfo-compiled-0.4))
-       #:cargo-development-inputs
-       (("rust-datetime" ,rust-datetime-0.4))
-       #:phases
-       (modify-phases %standard-phases
-         ;; Ignoring failing tests.
-         ;; Reported in https://github.com/ogham/exa/issues/318
-         (add-before 'check 'disable-failing-tests
-           (lambda _
-             (substitute* "src/options/mod.rs"
-               (("^.*fn oneline_across.*" oneline-across)
-                (string-append "#[ignore]\n" oneline-across)))
-
-             (substitute* "src/options/view.rs"
-               (("test!\\(across:.*") "")
-               (("test!\\(cr:.*") "")
-               (("test!\\(empty:.*") "")
-               (("test!\\(gracross:.*") "")
-               (("test!\\(grid:.*") "")
-               (("test!\\(icons:.*") "")
-               (("test!\\(just_binary:.*") "")
-               (("test!\\(just_blocks:.*") "")
-               (("test!\\(just_bytes:.*") "")
-               (("test!\\(just_git:.*") "")
-               (("test!\\(just_group:.*") "")
-               (("test!\\(just_header:.*") "")
-               (("test!\\(just_inode:.*") "")
-               (("test!\\(just_links:.*") "")
-               (("test!\\(leg:.*") "")
-               (("test!\\(lid:.*") "")
-               (("test!\\(original_g:.*") ""))
-             #t))
-         (add-after 'install 'install-extras
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out   (assoc-ref outputs "out"))
-                    (share (string-append out "/share"))
-                    (man1  (string-append share "/man/man1")))
-               (install-file "contrib/man/exa.1" man1)
-               (mkdir-p (string-append out "/etc/bash_completion.d"))
-               (mkdir-p (string-append share "/fish/vendor_completions.d"))
-               (mkdir-p (string-append share "/zsh/site-functions"))
-               (copy-file "contrib/completions.bash"
-                          (string-append out "/etc/bash_completion.d/exa"))
-               (copy-file "contrib/completions.fish"
-                          (string-append share "/fish/vendor_completions.d/exa.fish"))
-               (copy-file "contrib/completions.zsh"
-                          (string-append share "/zsh/site-functions/_exa"))
-               #t))))))
-    (inputs
-     (list libgit2 zlib))
-    (native-inputs
-     (list pkg-config))
+     `(#:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12)
+                       ("rust-datetime" ,rust-datetime-0.5)
+                       ("rust-env-logger" ,rust-env-logger-0.6)
+                       ("rust-git2" ,rust-git2-0.13)
+                       ("rust-glob" ,rust-glob-0.3)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-locale" ,rust-locale-0.2)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-natord" ,rust-natord-1)
+                       ("rust-num-cpus" ,rust-num-cpus-1)
+                       ("rust-number-prefix" ,rust-number-prefix-0.4)
+                       ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1)
+                       ("rust-term-grid" ,rust-term-grid-0.1)
+                       ("rust-term-size" ,rust-term-size-0.3)
+                       ("rust-unicode-width" ,rust-unicode-width-0.1)
+                       ("rust-users" ,rust-users-0.11)
+                       ("rust-zoneinfo-compiled" ,rust-zoneinfo-compiled-0.5))
+       #:cargo-development-inputs (("rust-datetime" ,rust-datetime-0.5))
+       #:phases (modify-phases %standard-phases
+                  (add-after 'build 'build-manual
+                    (lambda _
+                      (map (lambda (page)
+                             (system (string-append
+                                      "pandoc --standalone -f markdown -t man man/"
+                                      page ".md > " page)))
+                           `("exa.1" "exa_colors.5")) #t))
+                  (add-after 'install 'install-extras
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out"))
+                             (share (string-append out "/share"))
+                             (man1 (string-append share "/man/man1"))
+                             (man5 (string-append share "/man/man5")))
+                        (install-file "exa.1" man1)
+                        (install-file "exa_colors.5" man5)
+                        (mkdir-p (string-append out "/etc/bash_completion.d"))
+                        (mkdir-p (string-append share
+                                                "/fish/vendor_completions.d"))
+                        (mkdir-p (string-append share "/zsh/site-functions"))
+                        (copy-file "completions/completions.bash"
+                                   (string-append out
+                                    "/etc/bash_completion.d/exa"))
+                        (copy-file "completions/completions.fish"
+                                   (string-append share
+                                    "/fish/vendor_completions.d/exa.fish"))
+                        (copy-file "completions/completions.zsh"
+                                   (string-append share
+                                                  "/zsh/site-functions/_exa"))
+                        #t))))))
+    (inputs (list libgit2 zlib))
+    (native-inputs (list pkg-config pandoc))
     (home-page "https://the.exa.website/")
     (synopsis "Modern replacement for ls")
-    (description "@code{exa} is a modern replacement for the command-line
+    (description
+     "@code{exa} is a modern replacement for the command-line
 program @code{ls}.  It uses colours to distinguish file types and metadata.  It
 also knows about symlinks, extended attributes, and Git.")
     (license license:expat)))
-- 
2.37.2

[bug#57448] [PATCH 0/5] gnu: exa: Update to 0.10.1.

[Ludovic Courtès]

Hi,

ギャラ <me@gyara.moe> skribis:

>       gnu: Add rust-number-prefix 0.4.0
>       gnu: rust-iso8601: Update to 0.3
>       gnu: rust-datetime: Update to 0.5.2
>       gnu: rust-zoneinfo-compiled: Update to 0.5.1.
>       gnu: exa: Update to 0.10.1

Efraim, could you take a look at this series?  I never whether it’s okay
to update a given Rust package.

  https://issues.guix.gnu.org/57448

Thanks,
Ludo’.

bug#57448: [PATCH 0/5] gnu: exa: Update to 0.10.1.

[Efraim Flashner]

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

On Mon, Sep 26, 2022 at 09:51:38PM +0200, Ludovic Courtès wrote:
> Hi,
> 
> ギャラ <me@gyara.moe> skribis:
> 
> >       gnu: Add rust-number-prefix 0.4.0
> >       gnu: rust-iso8601: Update to 0.3
> >       gnu: rust-datetime: Update to 0.5.2
> >       gnu: rust-zoneinfo-compiled: Update to 0.5.1.
> >       gnu: exa: Update to 0.10.1
> 
> Efraim, could you take a look at this series?  I never whether it’s okay
> to update a given Rust package.
> 
>   https://issues.guix.gnu.org/57448

I've removed the bits about removing old rust packages; I'd rather leave
that for another time.

I adjusted the indentation so that the patches are smaller and I
completed the commit messages. I also added a follow-up commit to exa to
only use pandoc where it is supported.

Thanks for the patches!

-- 
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 --]