[PATCH 00/14] gnu: rust-git2: Update to 0.18.1

Done

Details

2 participants

Efraim Flashner
Rémi Teissier

Owner: unassigned

Submitted by: Rémi Teissier

Severity: normal

Rémi Teissier wrote on 2 Dec 2023 22:25

Recipients:(address . guix-patches@gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:cover.1701551502.git.rteissier.code@chillpc.fr

*** BLURB HERE ***

Rémi Teissier (14):
  gnu: libgit2: Update to 1.7.1.
  gnu: rust-time-core: Update to 0.1.2.
  gnu: rust-quick-xml: Update to 0.31.0.
  gnu: Add rust-bugreport.
  gnu: Add rust-deranged.
  gnu: rust-fancy-regex: Update to 0.11.0.
  gnu: rust-indexmap: Update to 2.1.0.
  gnu: Add rust-syntect.
  gnu: rust-plist: Update to 1.6.0.
  gnu: Add rust-powerfmt-macros.
  gnu: Add rust-powerfmt.
  gnu: rust-libssh2-sys: Update 0.3.0.
  gnu: rust-libgit2-sys: Update to 0.16.1+1.7.1.
  gnu: rust-git2: Update to 0.18.1.

 gnu/packages/crates-io.scm       | 489 ++++++++++++++++++++++++++-----
 gnu/packages/version-control.scm |  58 +++-
 2 files changed, 471 insertions(+), 76 deletions(-)


base-commit: 7ab24d717d1ddc71b325018fb81fe78008a9cae1
-- 
2.41.0

Rémi Teissier wrote on 2 Dec 2023 22:33

[PATCH 01/14] gnu: libgit2: Update to 1.7.1.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:82f968303dafb78229fd392c37f4cff702fb5d28.1701551502.git.rteissier.code@chillpc.fr

Change-Id: I53c7d49c2809599c79b31491859ef35d4314a770

---

gnu/packages/version-control.scm | 58 +++++++++++++++++++++++++++++---

1 file changed, 54 insertions(+), 4 deletions(-)

Toggle diff (90 lines)diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index e1d7e19703..0c52778c7f 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -823,7 +823,7 @@ (define-public git-cal
 (define-public libgit2
   (package
     (name "libgit2")
-    (version "1.5.1")
+    (version "1.7.1")
     (source (origin
               ;; Since v1.1.1, release artifacts are no longer offered (see:
               ;; https://github.com/libgit2/libgit2/discussions/5932#discussioncomment-1682729).
@@ -834,11 +834,19 @@ (define-public libgit2
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "04ypzpicpgq1wh6anwcmjjyh2b854lvjhxq0hq2hbsx7kb14qc1b"))
+                "1wq6a91k97gbsyafla39yvn1lnr559hqc41ksz1qxv7flf5kyvfx"))
               (modules '((guix build utils)))
               (snippet
                '(begin
-                  (delete-file-recursively "deps")))))
+                  ;TODO: package unversioned xdiff project
+                  (delete-file-recursively "deps/chromium-zlib")
+                  (delete-file-recursively "deps/http-parser")
+                  (delete-file-recursively "deps/ntlmclient")
+                  (delete-file-recursively "deps/pcre")
+                  (delete-file-recursively "deps/winhttp")
+                  (delete-file-recursively "deps/zlib")
+                  ))
+              ))
     (build-system cmake-build-system)
     (outputs '("out" "debug"))
     (arguments
@@ -886,9 +894,51 @@ (define-public libgit2
     ;; GPLv2 with linking exception
     (license license:gpl2)))
 
-(define-public libgit2-1.4
+(define-public libgit2-1.6
   (package
     (inherit libgit2)
+    (name "libgit2")
+    (version "1.6.4")
+    (source (origin
+              ;; Since v1.1.1, release artifacts are no longer offered (see:
+              ;; https://github.com/libgit2/libgit2/discussions/5932#discussioncomment-1682729).
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/libgit2/libgit2")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "078jnis7lwzb38ha5lcrs8hzi4br3c8v7c9xaqkvkcaa8nifcvcm"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  (delete-file-recursively "deps")))))))
+
+(define-public libgit2-1.5
+  (package
+    (inherit libgit2-1.6)
+    (name "libgit2")
+    (version "1.5.1")
+    (source (origin
+              ;; Since v1.1.1, release artifacts are no longer offered (see:
+              ;; https://github.com/libgit2/libgit2/discussions/5932#discussioncomment-1682729).
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/libgit2/libgit2")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "04ypzpicpgq1wh6anwcmjjyh2b854lvjhxq0hq2hbsx7kb14qc1b"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  (delete-file-recursively "deps")))))))
+
+(define-public libgit2-1.4
+  (package
+    (inherit libgit2-1.5)
     (version "1.4.5")
     (source (origin
               (inherit (package-source libgit2))
-- 
2.41.0

Rémi Teissier wrote on 2 Dec 2023 22:33

[PATCH 02/14] gnu: rust-time-core: Update to 0.1.2.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:08b2db9d3db697227636c8c2cb1eac094d8ee504.1701551502.git.rteissier.code@chillpc.fr

Change-Id: I08374bf746b78ffbbb2ee65e11ec316cd11fbd9c

---

gnu/packages/crates-io.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d42ff60a20..ed97c34028 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -74105,13 +74105,13 @@ (define-public rust-time-0.1
 (define-public rust-time-core-0.1
   (package
     (name "rust-time-core")
-    (version "0.1.0")
+    (version "0.1.2")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "time-core" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
-               (base32 "1z803zwzyh16nk3c4nmkw8v69nyj0r4v8s3yag68mvya38gkw59f"))))
+               (base32 "1wx3qizcihw6z151hywfzzyd1y5dl804ydyxci6qm07vbakpr4pg"))))
     (build-system cargo-build-system)
     (arguments '(#:tests? #f))      ; Doc tests fail.
     (home-page "https://github.com/time-rs/time")
-- 
2.41.0

Rémi Teissier wrote on 2 Dec 2023 22:33

[PATCH 03/14] gnu: rust-quick-xml: Update to 0.31.0.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:c66acebf24ff1530f574292b164cbe4f3db69516.1701551502.git.rteissier.code@chillpc.fr

Change-Id: I60299821bdcf5ef3960971f9f06c63c728e5c3d8

---

gnu/packages/crates-io.scm | 42 ++++++++++++++++++++++++++++++++------

1 file changed, 36 insertions(+), 6 deletions(-)

Toggle diff (64 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ed97c34028..5d11c7468b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54898,8 +54898,43 @@ (define-public rust-quick-error-1
          (base32
           "1q6za3v78hsspisc197bg3g7rpc989qycy8ypr8ap8igv10ikl51"))))))
 
+(define-public rust-quick-xml-0.31
+  (package
+    (name "rust-quick-xml")
+    (version "0.31.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "quick-xml" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "0cravqanylzh5cq2v6hzlfqgxcid5nrp2snnb3pf4m0and2a610h"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-tokio" ,rust-tokio-1)
+         ("rust-serde" ,rust-serde-1)
+         ("rust-encoding-rs" ,rust-encoding-rs-0.8)
+         ("rust-document-features" ,rust-document-features-0.2)
+         ("rust-arbitrary" ,rust-arbitrary-1)
+         ("rust-memchr" ,rust-memchr-2))
+        #:cargo-development-inputs
+        (("rust-tokio-test" ,rust-tokio-test-0.4)
+         ("rust-tokio" ,rust-tokio-1)
+         ("rust-serde-value" ,rust-serde-value-0.7)
+         ("rust-serde-derive" ,rust-serde-derive-1)
+         ("rust-regex" ,rust-regex-1)
+         ("rust-pretty-assertions" ,rust-pretty-assertions-1)
+         ("rust-criterion" ,rust-criterion-0.4))))
+    (home-page "https://github.com/tafia/quick-xml")
+    (synopsis "High performance xml reader and writer")
+    (description
+     "This package provides a high performance XML reader and writer.")
+    (license license:expat)))
+
 (define-public rust-quick-xml-0.28
   (package
+    (inherit rust-quick-xml-0.31)
     (name "rust-quick-xml")
     (version "0.28.2")
     (source
@@ -54926,12 +54961,7 @@ (define-public rust-quick-xml-0.28
         ("rust-serde-value" ,rust-serde-value-0.7)
         ("rust-serde-derive" ,rust-serde-derive-1)
         ("rust-tokio" ,rust-tokio-1)
-        ("rust-tokio-test" ,rust-tokio-test-0.4))))
-    (home-page "https://github.com/tafia/quick-xml")
-    (synopsis "High performance xml reader and writer")
-    (description
-     "This package provides a high performance XML reader and writer.")
-    (license license:expat)))
+        ("rust-tokio-test" ,rust-tokio-test-0.4))))))
 
 (define-public rust-quick-xml-0.27
   (package
-- 
2.41.0

Rémi Teissier wrote on 2 Dec 2023 22:33

[PATCH 04/14] gnu: Add rust-bugreport.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:45f505f91102f34312955a305fcb4188a52940cc.1701551502.git.rteissier.code@chillpc.fr

Change-Id: I014f485dbeea18f67bc18ee2987a55a8b61c2f00

---

gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++

1 file changed, 25 insertions(+)

Toggle diff (38 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5d11c7468b..1f47f5371f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -9723,6 +9723,31 @@ (define-public rust-bstr-0.2
         ("rust-ucd-parse" ,rust-ucd-parse-0.1)
         ("rust-unicode-segmentation" ,rust-unicode-segmentation-1))))))
 
+(define-public rust-bugreport-0.5
+  (package
+    (name "rust-bugreport")
+    (version "0.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "bugreport" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256 (base32 "1jcq9ywxyd7fw1ing8ixna0cfcs5lrviyvx6h6080ir532w20lak"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-sys-info" ,rust-sys-info-0.9)
+         ("rust-git-version" ,rust-git-version-0.3)
+         ("rust-shell-escape" ,rust-shell-escape-0.1))
+        #:cargo-development-inputs
+        (("rust-tempfile" ,rust-tempfile-3)
+         ("rust-pretty-assertions" ,rust-pretty-assertions-1))))
+    (home-page "https://github.com/sharkdp/bugreport")
+    (synopsis "Collect system and environment information for bug reports")
+    (description "bugreport is a Rust library that helps application developers
+to automatically collect information about the system and the environment that users
+can send along with a bug report (similar to @code{git bugreport} or @code{ffmpeg …} -report).")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-buf-min-0.7
   (package
     (name "rust-buf-min")
-- 
2.41.0

Rémi Teissier wrote on 2 Dec 2023 22:33

[PATCH 05/14] gnu: Add rust-deranged.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:1d73d0775bc26e70eb91247b8ae32ad10f8d6c02.1701551502.git.rteissier.code@chillpc.fr

Change-Id: Iba195a0a3358818ebaf605b6b969ca2e057de02a

---

gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++

1 file changed, 27 insertions(+)

Toggle diff (40 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1f47f5371f..d55c14b768 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -20485,6 +20485,33 @@ (define-public rust-der-parser-6
         ("rust-pretty-assertions" ,rust-pretty-assertions-0.7)
         ("rust-test-case" ,rust-test-case-1))))))
 
+(define-public rust-deranged-0.3
+  (package
+    (name "rust-deranged")
+    (version "0.3.9")
+    (source
+      (origin
+       (method url-fetch)
+       (uri (crate-uri "deranged" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+         (base32 "1lqzxgxqa1jdsvh4r7fbckpxvvfr8b819vwzdzd2f166494x0chg"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-serde" ,rust-serde-1)
+         ("rust-rand" ,rust-rand-0.8)
+         ("rust-quickcheck" ,rust-quickcheck-1)
+         ("rust-powerfmt" ,rust-powerfmt-0.2)
+         ("rust-num-traits" ,rust-num-traits-0.2))
+        #:cargo-development-inputs
+        (("rust-serde-json" ,rust-serde-json-1)
+         ("rust-rand" ,rust-rand-0.8))))
+    (home-page "https://github.com/jhpratt/deranged")
+    (synopsis "Ranged integers")
+    (description "This crate is a proof-of-concept implementation of ranged integers.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-derivative-2
   (package
     (name "rust-derivative")
-- 
2.41.0

Rémi Teissier wrote on 2 Dec 2023 22:33

[PATCH 06/14] gnu: rust-fancy-regex: Update to 0.11.0.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:093e7774505163b13e24fdcb7e15af6a3bd03a23.1701551502.git.rteissier.code@chillpc.fr

Change-Id: I5cfacdb59ce28565fecc87e1afd8103b3d639c2c

---

gnu/packages/crates-io.scm | 41 ++++++++++++++++++++++++++++----------

1 file changed, 31 insertions(+), 10 deletions(-)

Toggle diff (63 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d55c14b768..7794ecf89a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -25182,8 +25182,38 @@ (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.11
+  (package
+    (name "rust-fancy-regex")
+    (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 "18j0mmzfycibhxhhhfja00dxd1vf8x5c28lbry224574h037qpxr"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-regex" ,rust-regex-1)
+         ("rust-bit-set" ,rust-bit-set-0.5))
+        #:cargo-development-inputs
+        (("rust-quickcheck" ,rust-quickcheck-1)
+         ("rust-matches" ,rust-matches-0.1)
+         ("rust-criterion" ,rust-criterion-0.3))))
+    (home-page "https://github.com/fancy-regex/fancy-regex")
+    (synopsis "Implementation of regexes with a rich set of features")
+    (description
+     "This package is a Rust library for compiling and matching regular
+expressions.  It uses a hybrid regex implementation designed to support
+a relatively rich set of features.  In particular, it uses backtracking to
+implement features such as look-around and backtracking, which are not
+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
@@ -25198,16 +25228,7 @@ (define-public rust-fancy-regex-0.7
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-bit-set" ,rust-bit-set-0.5)
-        ("rust-regex" ,rust-regex-1))))
-    (home-page "https://github.com/fancy-regex/fancy-regex")
-    (synopsis "Implementation of regexes with a rich set of features")
-    (description
-     "This package is a Rust library for compiling and matching regular
-expressions.  It uses a hybrid regex implementation designed to support
-a relatively rich set of features.  In particular, it uses backtracking to
-implement features such as look-around and backtracking, which are not
-supported in purely NFA-based implementations.")
-    (license license:expat)))
+        ("rust-regex" ,rust-regex-1))))))
 
 (define-public rust-fast-chemail-0.9
   (package
-- 
2.41.0

Rémi Teissier wrote on 2 Dec 2023 22:33

[PATCH 08/14] gnu: Add rust-syntect.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:00940d67be624dd7b700f6f24d70baa9cfb38920.1701551503.git.rteissier.code@chillpc.fr

Change-Id: I5c6ef2044f6a39e88d9ecc6f64d35117d5791aae

---

gnu/packages/crates-io.scm | 42 ++++++++++++++++++++++++++++++++++++++

1 file changed, 42 insertions(+)

Toggle diff (55 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 35e0c050c9..4123a1235e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -71047,6 +71047,48 @@ (define-public rust-syn-test-suite-0.0.0
     (description "Test suite of the syn crate.")
     (license (list license:expat license:asl2.0))))
 
+(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
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-yaml-rust" ,rust-yaml-rust-0.4)
+                       ("rust-regex-syntax" ,rust-regex-syntax-0.7)
+                       ("rust-plist" ,rust-plist-1)
+                       ("rust-onig" ,rust-onig-6)
+                       ("rust-fnv" ,rust-fnv-1)
+                       ("rust-flate2" ,rust-flate2-1)
+                       ("rust-fancy-regex" ,rust-fancy-regex-0.11)
+                       ("rust-bincode" ,rust-bincode-1)
+                       ("rust-walkdir" ,rust-walkdir-2)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-bitflags" ,rust-bitflags-1))
+       #:cargo-development-inputs (("rust-regex" ,rust-regex-1)
+                                   ("rust-rayon" ,rust-rayon-1)
+                                   ("rust-pretty-assertions" ,rust-pretty-assertions-0.6)
+                                   ("rust-getopts" ,rust-getopts-0.2)
+                                   ("rust-criterion" ,rust-criterion-0.3))))
+    (home-page "https://github.com/trishume/syntect")
+    (synopsis
+     "Library for high quality syntax highlighting and code intelligence using Sublime Text's grammars")
+    (description
+     "syntect is a syntax highlighting library for Rust that uses Sublime Text syntax
+definitions. It aims to be a good solution for any Rust project that needs syntax highligting,
+including deep integration with text editors written in Rust.")
+    (license license:expat)))
+
 (define-public rust-synchronoise-1
   (package
     (name "rust-synchronoise")
-- 
2.41.0

Rémi Teissier wrote on 2 Dec 2023 22:33

[PATCH 07/14] gnu: rust-indexmap: Update to 2.1.0.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:678d5ffa2649ed91ad015c18e676cbdd6d5bc146.1701551502.git.rteissier.code@chillpc.fr

Change-Id: Icae0b1bc04bb5ff2ed50984a8b21591ff0ac060c

---

gnu/packages/crates-io.scm | 48 +++++++++++++++++++-------------------

1 file changed, 24 insertions(+), 24 deletions(-)

Toggle diff (63 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7794ecf89a..35e0c050c9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33805,32 +33805,32 @@ (define-public rust-indenter-0.3
 (define-public rust-indexmap-2
   (package
     (name "rust-indexmap")
-    (version "2.0.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "indexmap" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0pdnbvv6gnyxx2li8mks8p00fya3ynmhx3n6infpcy8a4gi7yiym"))))
+    (version "2.1.0")
+    (source
+      (origin
+         (method url-fetch)
+         (uri (crate-uri "indexmap" version))
+         (file-name (string-append name "-" version ".tar.gz"))
+         (sha256
+           (base32 "07rxrqmryr1xfnmhrjlz8ic6jw28v6h5cig3ws2c9d0wifhy2c6m"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-arbitrary" ,rust-arbitrary-1)
-        ("rust-equivalent" ,rust-equivalent-1)
-        ("rust-hashbrown" ,rust-hashbrown-0.14)
-        ("rust-quickcheck" ,rust-quickcheck-1)
-        ("rust-rayon" ,rust-rayon-1)
-        ("rust-rustc-rayon" ,rust-rustc-rayon-0.5)
-        ("rust-serde" ,rust-serde-1))
-       #:cargo-development-inputs
-       (("rust-fnv" ,rust-fnv-1)
-        ("rust-fxhash" ,rust-fxhash-0.2)
-        ("rust-itertools" ,rust-itertools-0.10)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-quickcheck" ,rust-quickcheck-1)
-        ("rust-rand" ,rust-rand-0.8)
-        ("rust-serde-derive" ,rust-serde-derive-1))))
+      `(#:cargo-inputs
+        (("rust-serde" ,rust-serde-1)
+         ("rust-rustc-rayon" ,rust-rustc-rayon-0.5)
+         ("rust-rayon" ,rust-rayon-1)
+         ("rust-quickcheck" ,rust-quickcheck-1)
+         ("rust-arbitrary" ,rust-arbitrary-1)
+         ("rust-hashbrown" ,rust-hashbrown-0.14)
+         ("rust-equivalent" ,rust-equivalent-1))
+        #:cargo-development-inputs
+        (("rust-serde-derive" ,rust-serde-derive-1)
+         ("rust-rand" ,rust-rand-0.8)
+         ("rust-quickcheck" ,rust-quickcheck-1)
+         ("rust-lazy-static" ,rust-lazy-static-1)
+         ("rust-itertools" ,rust-itertools-0.11)
+         ("rust-fxhash" ,rust-fxhash-0.2)
+         ("rust-fnv" ,rust-fnv-1))))
     (home-page "https://github.com/bluss/indexmap")
     (synopsis "Hash table with consistent order and fast iteration")
     (description
-- 
2.41.0

Rémi Teissier wrote on 2 Dec 2023 22:33

[PATCH 09/14] gnu: rust-plist: Update to 1.6.0.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:2f4467c7b8c9290970a237b10fbdac8d4148791c.1701551503.git.rteissier.code@chillpc.fr

Change-Id: I21370583950a25f4f5b154def6f50e6ebd26e4b5

---

gnu/packages/crates-io.scm | 21 ++++++++++++---------

1 file changed, 12 insertions(+), 9 deletions(-)

Toggle diff (42 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4123a1235e..dc118c00d4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51741,23 +51741,26 @@ (define-public rust-pledge-0.4
 (define-public rust-plist-1
   (package
     (name "rust-plist")
-    (version "1.0.0")
+    (version "1.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "plist" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1zb7k48x1zf1dhqavs37qm24fxi98qb978xv2nzjkkp4x2a6scvv"))))
+         (base32 "1vscdjj7xy1pz80n3lwcg1jhsydcf2nvj4lfxsqs46ixlv49qsg5"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-base64" ,rust-base64-0.12)
-        ("rust-chrono" ,rust-chrono-0.4)
-        ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-line-wrap" ,rust-line-wrap-0.1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-xml-rs" ,rust-xml-rs-0.8))))
+      `(#:cargo-inputs
+        (("rust-base64" ,rust-base64-0.21)
+         ("rust-indexmap" ,rust-indexmap-2)
+         ("rust-line-wrap" ,rust-line-wrap-0.1)
+         ("rust-quick-xml" ,rust-quick-xml-0.31)
+         ("rust-serde" ,rust-serde-1)
+         ("rust-time" ,rust-time-0.3))
+        #:cargo-development-inputs
+        (("rust-serde-derive" ,rust-serde-derive-1)
+         ("rust-serde-yaml" ,rust-serde-yaml-0.8))))
     (home-page "https://github.com/ebarnard/rust-plist/")
     (synopsis "Rusty plist parser")
     (description
-- 
2.41.0

Rémi Teissier wrote on 2 Dec 2023 22:33

[PATCH 10/14] gnu: Add rust-powerfmt-macros.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:55c31bd2c236b30d9661fd8050bda240876e11a6.1701551503.git.rteissier.code@chillpc.fr

Change-Id: I6b5dc0acb9444fb2614000507ac96d0b96389ce1

---

gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++

1 file changed, 22 insertions(+)

Toggle diff (35 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index dc118c00d4..fe37e9ad3e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -52441,6 +52441,28 @@ (define-public rust-postgres-types-0.2
 and Postgres values.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-powerfmt-macros-0.1
+  (package
+    (name "rust-powerfmt-macros")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "powerfmt-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "097ir0g2hjq6sx20nc3k7r7cnyyflgn5lv64jmghyp5g63i5bwx8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-syn" ,rust-syn-2)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1))))
+    (home-page "https://github.com/jhpratt/powerfmt")
+    (synopsis "Procedural macros for @code{powerfmt}")
+    (description
+     "This crate is an implementation detail and should not be relied upon directly.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-ppv-lite86-0.2
   (package
     (name "rust-ppv-lite86")
-- 
2.41.0

Rémi Teissier wrote on 2 Dec 2023 22:33

[PATCH 11/14] gnu: Add rust-powerfmt.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:7d7f6ccd89d00ab1d3490ec05e1abc33119d28f7.1701551503.git.rteissier.code@chillpc.fr

Change-Id: I8f61d123f4db068ca629d50416fb4188a4dcb857

---

gnu/packages/crates-io.scm | 21 +++++++++++++++++++++

1 file changed, 21 insertions(+)

Toggle diff (34 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fe37e9ad3e..a95e6bad6b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -52441,6 +52441,27 @@ (define-public rust-postgres-types-0.2
 and Postgres values.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-powerfmt-0.2
+  (package
+    (name "rust-powerfmt")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "powerfmt" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "14ckj2xdpkhv3h6l5sdmb9f1d57z8hbfpdldjc2vl5givq2y77j3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-powerfmt-macros" ,rust-powerfmt-macros-0.1))))
+    (home-page "https://github.com/jhpratt/powerfmt")
+    (synopsis "Library that provides utilities for formatting values")
+    (description
+     "This crate makes it significantly easier to support filling to a minimum
+width with alignment, avoid heap allocation, and avoid repetitive calculations.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-powerfmt-macros-0.1
   (package
     (name "rust-powerfmt-macros")
-- 
2.41.0

Rémi Teissier wrote on 2 Dec 2023 22:33

[PATCH 12/14] gnu: rust-libssh2-sys: Update 0.3.0.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:45d93bf46102109fa00b5bcebbe8accc95820a81.1701551503.git.rteissier.code@chillpc.fr

Change-Id: I36d0e03fb2ad2c349fb621e128440c9eb9204131

---

gnu/packages/crates-io.scm | 41 +++++++++++++++++++++++++++++++++-----

1 file changed, 36 insertions(+), 5 deletions(-)

Toggle diff (70 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a95e6bad6b..3ea8782288 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38642,10 +38642,10 @@ (define-public rust-linux-raw-sys-0.0.46
            `(("rust-libc" ,rust-libc-0.2)
              ("rust-static-assertions" ,rust-static-assertions-1))))))
 
-(define-public rust-libssh2-sys-0.2
+(define-public rust-libssh2-sys-0.3
   (package
     (name "rust-libssh2-sys")
-    (version "0.2.19")
+    (version "0.3.0")
     (source
       (origin
         (method url-fetch)
@@ -38653,7 +38653,7 @@ (define-public rust-libssh2-sys-0.2
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "0mkhw4pksbz7gldj8hia7k6npc479n1x09i8r0pm275sac424ina"))
+          "1vkidqw5ll71ynqc93hgcq62iqkklzb5268zffd13ql7nwqa1j1d"))
         (modules '((guix build utils)))
         (snippet
          '(begin (delete-file-recursively "libssh2") #t))))
@@ -38675,8 +38675,39 @@ (define-public rust-libssh2-sys-0.2
     (synopsis "Native bindings to the libssh2 library")
     (description
      "This package provides native rust bindings to the @code{libssh2} library.")
-    (license (list license:asl2.0
-                   license:expat))))
+    (license
+      (list license:asl2.0 license:expat))))
+
+(define-public rust-libssh2-sys-0.2
+  (package
+    (inherit rust-libssh2-sys-0.3)
+    (name "rust-libssh2-sys")
+    (version "0.2.19")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "libssh2-sys" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0mkhw4pksbz7gldj8hia7k6npc479n1x09i8r0pm275sac424ina"))
+        (modules '((guix build utils)))
+        (snippet
+         '(begin (delete-file-recursively "libssh2") #t))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-libz-sys" ,rust-libz-sys-1)
+        ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+        ;; Build dependencies:
+        ("rust-cc" ,rust-cc-1)
+        ("rust-pkg-config" ,rust-pkg-config-0.3)
+        ("rust-vcpkg" ,rust-vcpkg-0.2))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list libssh2 openssl zlib))))
 
 (define-public rust-libtest-mimic-0.6
   (package
-- 
2.41.0

Rémi Teissier wrote on 2 Dec 2023 22:33

[PATCH 13/14] gnu: rust-libgit2-sys: Update to 0.16.1+1.7.1.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:0ae77779ddd97df56c370060192de8e2573f1308.1701551503.git.rteissier.code@chillpc.fr

Change-Id: I683fd8785dda47fecb07809e50b69aa872ad37c7

---

gnu/packages/crates-io.scm | 71 ++++++++++++++++++++++++++++++++++----

1 file changed, 64 insertions(+), 7 deletions(-)

Toggle diff (93 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3ea8782288..5c8c72342a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37193,8 +37193,71 @@ (define-public rust-libfuzzer-sys-0.3
     (license
      (list license:expat license:asl2.0 license:ncsa))))
 
+(define-public rust-libgit2-sys-0.16
+  (package
+    (name "rust-libgit2-sys")
+    (version "0.16.1+1.7.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libgit2-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "030dnq7hz79qs4rxdllc3ailvqzc432jwwxk7g8av55hh0vbp8pj"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   (delete-file-recursively "libgit2")))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libssh2-sys" ,rust-libssh2-sys-0.3)
+                       ("rust-libz-sys" ,rust-libz-sys-1)
+                       ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3))))
+    (native-inputs (list pkg-config))
+    (inputs (list libgit2 openssl zlib))
+    (home-page "https://github.com/rust-lang/git2-rs")
+    (synopsis "Native bindings to the libgit2 library")
+    (description
+     "This package provides native Rust bindings to the @code{libgit2}
+library.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-libgit2-sys-0.15
+  (package
+    (inherit rust-libgit2-sys-0.16)
+    (name "rust-libgit2-sys")
+    (version "0.15.2+1.6.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libgit2-sys" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1yllyq9wiryy257cfx8s7wadls24yzkxnhmbl95iz9ml3zhz43d8"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin (delete-file-recursively "libgit2")))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cc" ,rust-cc-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-libssh2-sys" ,rust-libssh2-sys-0.3)
+        ("rust-libz-sys" ,rust-libz-sys-1)
+        ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+        ("rust-pkg-config" ,rust-pkg-config-0.3))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list libgit2-1.6 openssl zlib))))
+
 (define-public rust-libgit2-sys-0.14
   (package
+    (inherit rust-libgit2-sys-0.15)
     (name "rust-libgit2-sys")
     (version "0.14.2+1.5.1")
     (source
@@ -37221,13 +37284,7 @@ (define-public rust-libgit2-sys-0.14
     (native-inputs
      (list pkg-config))
     (inputs
-     (list libgit2 openssl zlib))
-    (home-page "https://github.com/rust-lang/git2-rs")
-    (synopsis "Native bindings to the libgit2 library")
-    (description
-     "This package provides native Rust bindings to the @code{libgit2}
-library.")
-    (license (list license:expat license:asl2.0))))
+     (list libgit2-1.5 openssl zlib))))
 
 (define-public rust-libgit2-sys-0.13
   (package
-- 
2.41.0

Rémi Teissier wrote on 2 Dec 2023 22:33

[PATCH 14/14] gnu: rust-git2: Update to 0.18.1.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:df3df3786ef29bbe5ddb8b5466c6e3fda809fd83.1701551503.git.rteissier.code@chillpc.fr

Change-Id: Id22471f11ee0f59322771e8ca73611d330ffb783

---

gnu/packages/crates-io.scm | 84 ++++++++++++++++++++++++++++++++++----

1 file changed, 75 insertions(+), 9 deletions(-)

Toggle diff (130 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5c8c72342a..eabc49728e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -29253,10 +29253,10 @@ (define-public rust-git-version-macro-0.3
      "This is an internal macro crate for git-version.")
     (license license:bsd-2)))
 
-(define-public rust-git2-0.16
+(define-public rust-git2-0.18
   (package
     (name "rust-git2")
-    (version "0.16.1")
+    (version "0.18.1")
     (source
      (origin
        (method url-fetch)
@@ -29264,22 +29264,21 @@ (define-public rust-git2-0.16
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1k1aavsfhk0i9jycc9gb61w2jwy8w9dgkd7zkz295wwm566gdxyc"))))
+        (base32 "1kf0kvg3i7p1223zs2h9fz99ndm0l9kdx3hcw63g73dh5nlppygv"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bitflags" ,rust-bitflags-1)
         ("rust-libc" ,rust-libc-0.2)
-        ("rust-libgit2-sys" ,rust-libgit2-sys-0.14)
+        ("rust-libgit2-sys" ,rust-libgit2-sys-0.16)
         ("rust-log" ,rust-log-0.4)
         ("rust-openssl-probe" ,rust-openssl-probe-0.1)
         ("rust-openssl-sys" ,rust-openssl-sys-0.9)
         ("rust-url" ,rust-url-2))
        #:cargo-development-inputs
-       (("rust-paste" ,rust-paste-1)
-        ("rust-structopt" ,rust-structopt-0.3)
-        ("rust-tempfile" ,rust-tempfile-3)
-        ("rust-time" ,rust-time-0.1))))
+       (("rust-structopt" ,rust-structopt-0.3)
+         ("rust-tempfile" ,rust-tempfile-3)
+         ("rust-time" ,rust-time-0.1))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("git" ,git-minimal)))           ;for a single test
@@ -29293,6 +29292,73 @@ (define-public rust-git2-0.16
 reading and writing git repositories.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-git2-0.17
+  (package
+    (inherit rust-git2-0.18)
+    (name "rust-git2")
+    (version "0.17.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "git2" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0i00kg3yizh7mn6hnj3yz3hpniisidlavifgy8n3cnm9gim9v63v"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-libgit2-sys" ,rust-libgit2-sys-0.15)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-openssl-probe" ,rust-openssl-probe-0.1)
+        ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+        ("rust-url" ,rust-url-2))
+       #:cargo-development-inputs
+       (("rust-structopt" ,rust-structopt-0.3)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-time" ,rust-time-0.1))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("git" ,git-minimal)))           ;for a single test
+    (inputs
+     (list libgit2-1.6 libssh2 openssl zlib))))
+
+(define-public rust-git2-0.16
+  (package
+    (inherit rust-git2-0.17)
+    (name "rust-git2")
+    (version "0.16.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "git2" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1k1aavsfhk0i9jycc9gb61w2jwy8w9dgkd7zkz295wwm566gdxyc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-libgit2-sys" ,rust-libgit2-sys-0.14)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-openssl-probe" ,rust-openssl-probe-0.1)
+        ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+        ("rust-url" ,rust-url-2))
+       #:cargo-development-inputs
+       (("rust-paste" ,rust-paste-1)
+        ("rust-structopt" ,rust-structopt-0.3)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-time" ,rust-time-0.1))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("git" ,git-minimal)))           ;for a single test
+    (inputs
+     (list libgit2-1.5 libssh2 openssl zlib))))
+
 (define-public rust-git2-0.15
   (package
     (inherit rust-git2-0.16)
@@ -29325,7 +29391,7 @@ (define-public rust-git2-0.15
      `(("pkg-config" ,pkg-config)
        ("git" ,git-minimal)))           ;for a single test
     (inputs
-     (list libgit2 libssh2 openssl zlib))))
+     (list libgit2-1.5 libssh2 openssl zlib))))
 
 (define-public rust-git2-0.14
   (package
-- 
2.41.0

Rémi Teissier wrote on 12 Dec 2023 22:03

gnu: rust-git2: Update to 0.18.1

Recipients:(address . 67592@debbugs.gnu.org)

Message-ID:8ff3da22-0af4-4eb4-8126-476d4cc9af7a@chillpc.fr

Hello, I saw that my patchs lacks some version bumps. I will resend patches.

Rémi Teissier wrote on 12 Dec 2023 22:16

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:cover.1702415473.git.rteissier.code@chillpc.fr

*** BLURB HERE ***

Rémi Teissier (20):
  gnu: rust-time-core: Update to 0.1.2.
  gnu: rust-rstest-macros: Update to 0.18.2.
  gnu: rust-rstest: Update to 0.18.2.
  gnu: rust-time: Update to 0.3.30.
  gnu: rust-quick-xml: Update to 0.31.0.
  gnu: Add rust-bugreport.
  gnu: Add rust-deranged.
  gnu: rust-fancy-regex: Update to 0.11.0.
  gnu: rust-zerocopy-derive: Update to 0.7.29.
  gnu: rust-zerocopy: Update to 0.7.29.
  gnu: rust-ahash: Update to 0.8.6.
  gnu: rust-hashbrown: Update to 0.14.3.
  gnu: rust-indexmap: Update to 2.1.0.
  gnu: Add rust-syntect.
  gnu: rust-plist: Update to 1.6.0.
  gnu: Add rust-powerfmt-macros.
  gnu: Add rust-powerfmt.
  gnu: rust-libssh2-sys: Update 0.3.0.
  gnu: rust-libgit2-sys: Update to 0.16.1+1.7.1.
  gnu: rust-git2: Update to 0.18.1.

 gnu/packages/crates-io.scm | 785 +++++++++++++++++++++++++++++++------
 1 file changed, 655 insertions(+), 130 deletions(-)


base-commit: deac1e8618780b8d2aa09355884f915808ea8a5b
-- 
2.41.0

Rémi Teissier wrote on 12 Dec 2023 22:16

[PATCH 01/20] gnu: rust-time-core: Update to 0.1.2.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:7b75b6a024dd6fe9bd71bf83d42195bf3594b46f.1702415473.git.rteissier.code@chillpc.fr

Change-Id: I08374bf746b78ffbbb2ee65e11ec316cd11fbd9c

---

gnu/packages/crates-io.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d42ff60a20d..ed97c340280 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -74105,13 +74105,13 @@ (define-public rust-time-0.1
 (define-public rust-time-core-0.1
   (package
     (name "rust-time-core")
-    (version "0.1.0")
+    (version "0.1.2")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "time-core" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
-               (base32 "1z803zwzyh16nk3c4nmkw8v69nyj0r4v8s3yag68mvya38gkw59f"))))
+               (base32 "1wx3qizcihw6z151hywfzzyd1y5dl804ydyxci6qm07vbakpr4pg"))))
     (build-system cargo-build-system)
     (arguments '(#:tests? #f))      ; Doc tests fail.
     (home-page "https://github.com/time-rs/time")
-- 
2.41.0

Rémi Teissier wrote on 12 Dec 2023 22:16

[PATCH 03/20] gnu: rust-rstest: Update to 0.18.2.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:57f84570cf4b4851409dd96dcea086eaebe57bde.1702415473.git.rteissier.code@chillpc.fr

Change-Id: I815109d560fb6fcddc377f08da3846f3fe8f3891

---

gnu/packages/crates-io.scm | 77 ++++++++++++++++++++++++++++++++++----

1 file changed, 70 insertions(+), 7 deletions(-)

Toggle diff (99 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f3f38348fcd..0676042ef86 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -59191,8 +59191,77 @@ (define-public rust-rstar-0.8
          (base32
           "1b6vjfwvpcgy0q8ywywz548vhxrmhbz2sm6xyhnmj5p5xd1xfqff"))))))
 
+(define-public rust-rstest-0.18
+  (package
+    (name "rust-rstest")
+    (version "0.18.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rstest" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "1681ncnlzhc8894idm3pqf40nndn4k4kcp0kpv29n68a7hpspvlp"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+         (("rust-futures" ,rust-futures-0.3)
+          ("rust-rstest-macros" ,rust-rstest-macros-0.18)
+          ("rust-rustc-version" ,rust-rustc-version-0.4)
+          ("rust-futures-timer" ,rust-futures-timer-3))))
+    (home-page "https://github.com/la10736/rstest")
+    (synopsis "Rust fixture based test framework")
+    (description
+     "@code{rstest} uses procedural macros to help you write fixtures
+and table-based tests.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-rstest-0.17
+  (package
+    (inherit rust-rstest-0.18)
+    (name "rust-rstest")
+    (version "0.17.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rstest" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "0qnrx40c05ziz2sxhrj0i4pamvlip8cx7w62439qr1wils3b86yy"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+         (("rust-futures-timer" ,rust-futures-timer-3)
+          ("rust-rstest-macros" ,rust-rstest-macros-0.17)
+          ("rust-rustc-version" ,rust-rustc-version-0.4)
+          ("rust-futures" ,rust-futures-0.3))))))
+
+(define-public rust-rstest-0.16
+  (package
+    (inherit rust-rstest-0.17)
+    (name "rust-rstest")
+    (version "0.16.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rstest" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "1pqfpj727hkn4rr7nspnaab0h74gl9yxqlb53vn9h8a7dhbjszxh"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+         (("rust-futures-timer" ,rust-futures-timer-3)
+          ("rust-rstest-macros" ,rust-rstest-macros-0.16)
+          ("rust-rustc-version" ,rust-rustc-version-0.4)
+          ("rust-futures" ,rust-futures-0.3))))))
+
 (define-public rust-rstest-0.15
   (package
+    (inherit rust-rstest-0.16)
     (name "rust-rstest")
     (version "0.15.0")
     (source
@@ -59209,13 +59278,7 @@ (define-public rust-rstest-0.15
            `(("rust-futures" ,rust-futures-0.3)
              ("rust-futures-timer" ,rust-futures-timer-3)
              ("rust-rstest-macros" ,rust-rstest-macros-0.14)
-             ("rust-rustc-version" ,rust-rustc-version-0.3))))
-    (home-page "https://github.com/la10736/rstest")
-    (synopsis "Rust fixture based test framework")
-    (description
-     "@code{rstest} uses procedural macros to help you write fixtures
-and table-based tests.")
-    (license (list license:expat license:asl2.0))))
+             ("rust-rustc-version" ,rust-rustc-version-0.3))))))
 
 (define-public rust-rstest-0.12
   (package
-- 
2.41.0

Rémi Teissier wrote on 12 Dec 2023 22:16

[PATCH 04/20] gnu: rust-time: Update to 0.3.30.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:4c04fa76c39922b7db114789d54c3eb448ba744f.1702415473.git.rteissier.code@chillpc.fr

Change-Id: I1ec6d6d9d0d46606fbc8859c36770f1648bde8d4

---

gnu/packages/crates-io.scm | 53 ++++++++++++++++++++++----------------

1 file changed, 31 insertions(+), 22 deletions(-)

Toggle diff (69 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0676042ef86..6115e258fc7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -74145,31 +74145,40 @@ (define-public rust-tikv-jemalloc-ctl-0.4
 (define-public rust-time-0.3
   (package
     (name "rust-time")
-    (version "0.3.19")
+    (version "0.3.30")
     (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "time" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1hnnp3138zxk42r077jxhk1kma16bn9di1w5k3yzi3zd7wxhl9ak"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin (substitute* "Cargo.toml"
-                  (("=0\\.2\\.7") "^0.2.7"))))))
+      (origin
+         (method url-fetch)
+         (uri (crate-uri "time" version))
+         (file-name (string-append name "-" version ".tar.gz"))
+         (sha256
+           (base32 "1xgnflidij6361zjg4mzz4lqndayq1ph82n1cbjydppj02rlm8y4"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-itoa" ,rust-itoa-1)
-        ("rust-js-sys" ,rust-js-sys-0.3)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-num-threads" ,rust-num-threads-0.1)
-        ("rust-quickcheck" ,rust-quickcheck-1)
-        ("rust-rand" ,rust-rand-0.8)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-time-core" ,rust-time-core-0.1)
-        ("rust-time-macros" ,rust-time-macros-0.2))))
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-deranged" ,rust-deranged-0.3)
+         ("rust-itoa" ,rust-itoa-1)
+         ("rust-js-sys" ,rust-js-sys-0.3)
+         ("rust-libc" ,rust-libc-0.2)
+         ("rust-num-threads" ,rust-num-threads-0.1)
+         ("rust-powerfmt" ,rust-powerfmt-0.2)
+         ("rust-quickcheck" ,rust-quickcheck-1)
+         ("rust-rand" ,rust-rand-0.8)
+         ("rust-serde" ,rust-serde-1)
+         ("rust-time-core" ,rust-time-core-0.1)
+         ("rust-time-macros" ,rust-time-macros-0.2))
+        #:cargo-development-inputs
+        (("rust-criterion" ,rust-criterion-0.5)
+         ("rust-quickcheck-macros" ,rust-quickcheck-macros-1)
+         ("rust-rand" ,rust-rand-0.8)
+         ("rust-rstest" ,rust-rstest-0.18)
+         ("rust-rstest-reuse" ,rust-rstest-reuse-0.6)
+         ("rust-serde" ,rust-serde-1)
+         ("rust-serde-json" ,rust-serde-json-1)
+         ("rust-serde-test" ,rust-serde-test-1)
+         ("rust-time-macros" ,rust-time-macros-0.2)
+         ("rust-trybuild" ,rust-trybuild-1))))
     (home-page "https://github.com/time-rs/time")
     (synopsis "Date and time library")
     (description "This package provides a date and time library.  It is fully
-- 
2.41.0

Rémi Teissier wrote on 12 Dec 2023 22:16

[PATCH 02/20] gnu: rust-rstest-macros: Update to 0.18.2.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:973948d2e646a49c6ca4253cfc481f9ccaa7e88a.1702415473.git.rteissier.code@chillpc.fr

Change-Id: I2673a899efe0c65712f4c6f9d5cec4ab57b8c62b

---

gnu/packages/crates-io.scm | 85 ++++++++++++++++++++++++++++++++++----

1 file changed, 78 insertions(+), 7 deletions(-)

Toggle diff (107 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ed97c340280..f3f38348fcd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -59292,8 +59292,85 @@ (define-public rust-rstest-0.6
                (base32
                 "1wdd0ci0bn6fd5v5c19lhlqrpadk18fl4jzvh75b26616anlxdil"))))))
 
+(define-public rust-rstest-macros-0.18
+  (package
+    (name "rust-rstest-macros")
+    (version "0.18.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rstest_macros" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256 (base32 "01g6rg60snmscipc9xiili7nsn0v25sv64713gp99y2jg0jgha6l"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-cfg-if" ,rust-cfg-if-1)
+         ("rust-glob" ,rust-glob-0.3)
+         ("rust-proc-macro2" ,rust-proc-macro2-1)
+         ("rust-quote" ,rust-quote-1)
+         ("rust-regex" ,rust-regex-1)
+         ("rust-relative-path" ,rust-relative-path-1)
+         ("rust-rustc-version" ,rust-rustc-version-0.4)
+         ("rust-syn" ,rust-syn-1)
+         ("rust-unicode-ident" ,rust-unicode-ident-1))))
+    (home-page "https://github.com/la10736/rstest")
+    (synopsis "Procedural macros for @code{rstest}.")
+    (description
+     "This package provides the procedural macro crate for
+@code{rstest}.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-rstest-macros-0.17
+  (package
+    (inherit rust-rstest-macros-0.18)
+    (name "rust-rstest-macros")
+    (version "0.17.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rstest_macros" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "1a7w30h0g88v40p938skcbngsm6x6pf49gc369ydnznar2hs2319"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-cfg-if" ,rust-cfg-if-1)
+         ("rust-proc-macro2" ,rust-proc-macro2-1)
+         ("rust-quote" ,rust-quote-1)
+         ("rust-rustc-version" ,rust-rustc-version-0.4)
+         ("rust-syn" ,rust-syn-1)
+         ("rust-unicode-ident" ,rust-unicode-ident-1))))))
+
+(define-public rust-rstest-macros-0.16
+  (package
+    (inherit rust-rstest-macros-0.17)
+    (name "rust-rstest-macros")
+    (version "0.16.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rstest_macros" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "1xzrgwjih87myghqzm9ncqm0449y2sf4migz6x7yc1h7mq2vaabj"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-cfg-if" ,rust-cfg-if-1)
+         ("rust-proc-macro2" ,rust-proc-macro2-1)
+         ("rust-quote" ,rust-quote-1)
+         ("rust-rustc-version" ,rust-rustc-version-0.4)
+         ("rust-syn" ,rust-syn-1)
+         ("rust-unicode-ident" ,rust-unicode-ident-1))))))
+
 (define-public rust-rstest-macros-0.14
   (package
+    (inherit rust-rstest-macros-0.16)
     (name "rust-rstest-macros")
     (version "0.14.0")
     (source (origin
@@ -59311,13 +59388,7 @@ (define-public rust-rstest-macros-0.14
              ("rust-proc-macro2" ,rust-proc-macro2-1)
              ("rust-quote" ,rust-quote-1)
              ("rust-rustc-version" ,rust-rustc-version-0.4)
-             ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/la10736/rstest")
-    (synopsis "Procedural macros for @code{rstest}.")
-    (description
-     "This package provides the procedural macro crate for
-@code{rstest}.")
-    (license (list license:expat license:asl2.0))))
+             ("rust-syn" ,rust-syn-1))))))
 
 (define-public rust-rstest-reuse-0.4
   (package
-- 
2.41.0

Rémi Teissier wrote on 12 Dec 2023 22:16

[PATCH 07/20] gnu: Add rust-deranged.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:187a0aab8595f4427b51a671610d11745c1c6db0.1702415473.git.rteissier.code@chillpc.fr

Change-Id: Iba195a0a3358818ebaf605b6b969ca2e057de02a

---

gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++

1 file changed, 27 insertions(+)

Toggle diff (40 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 034f3decb86..0c775f196b8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -20485,6 +20485,33 @@ (define-public rust-der-parser-6
         ("rust-pretty-assertions" ,rust-pretty-assertions-0.7)
         ("rust-test-case" ,rust-test-case-1))))))
 
+(define-public rust-deranged-0.3
+  (package
+    (name "rust-deranged")
+    (version "0.3.9")
+    (source
+      (origin
+       (method url-fetch)
+       (uri (crate-uri "deranged" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+         (base32 "1lqzxgxqa1jdsvh4r7fbckpxvvfr8b819vwzdzd2f166494x0chg"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-serde" ,rust-serde-1)
+         ("rust-rand" ,rust-rand-0.8)
+         ("rust-quickcheck" ,rust-quickcheck-1)
+         ("rust-powerfmt" ,rust-powerfmt-0.2)
+         ("rust-num-traits" ,rust-num-traits-0.2))
+        #:cargo-development-inputs
+        (("rust-serde-json" ,rust-serde-json-1)
+         ("rust-rand" ,rust-rand-0.8))))
+    (home-page "https://github.com/jhpratt/deranged")
+    (synopsis "Ranged integers")
+    (description "This crate is a proof-of-concept implementation of ranged integers.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-derivative-2
   (package
     (name "rust-derivative")
-- 
2.41.0

Rémi Teissier wrote on 12 Dec 2023 22:16

[PATCH 06/20] gnu: Add rust-bugreport.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:0f434e4b34fd81a6b5c7e4435c42548da423d580.1702415473.git.rteissier.code@chillpc.fr

Change-Id: I014f485dbeea18f67bc18ee2987a55a8b61c2f00

---

gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++

1 file changed, 25 insertions(+)

Toggle diff (38 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1c3fffde597..034f3decb86 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -9723,6 +9723,31 @@ (define-public rust-bstr-0.2
         ("rust-ucd-parse" ,rust-ucd-parse-0.1)
         ("rust-unicode-segmentation" ,rust-unicode-segmentation-1))))))
 
+(define-public rust-bugreport-0.5
+  (package
+    (name "rust-bugreport")
+    (version "0.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "bugreport" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256 (base32 "1jcq9ywxyd7fw1ing8ixna0cfcs5lrviyvx6h6080ir532w20lak"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-sys-info" ,rust-sys-info-0.9)
+         ("rust-git-version" ,rust-git-version-0.3)
+         ("rust-shell-escape" ,rust-shell-escape-0.1))
+        #:cargo-development-inputs
+        (("rust-tempfile" ,rust-tempfile-3)
+         ("rust-pretty-assertions" ,rust-pretty-assertions-1))))
+    (home-page "https://github.com/sharkdp/bugreport")
+    (synopsis "Collect system and environment information for bug reports")
+    (description "bugreport is a Rust library that helps application developers
+to automatically collect information about the system and the environment that users
+can send along with a bug report (similar to @code{git bugreport} or @code{ffmpeg …} -report).")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-buf-min-0.7
   (package
     (name "rust-buf-min")
-- 
2.41.0

Rémi Teissier wrote on 12 Dec 2023 22:16

[PATCH 05/20] gnu: rust-quick-xml: Update to 0.31.0.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:c4ab2c0a175bbf921f0e796e2ea4bde83a8f97ab.1702415473.git.rteissier.code@chillpc.fr

Change-Id: I60299821bdcf5ef3960971f9f06c63c728e5c3d8

---

gnu/packages/crates-io.scm | 42 ++++++++++++++++++++++++++++++++------

1 file changed, 36 insertions(+), 6 deletions(-)

Toggle diff (64 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6115e258fc7..1c3fffde597 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54898,8 +54898,43 @@ (define-public rust-quick-error-1
          (base32
           "1q6za3v78hsspisc197bg3g7rpc989qycy8ypr8ap8igv10ikl51"))))))
 
+(define-public rust-quick-xml-0.31
+  (package
+    (name "rust-quick-xml")
+    (version "0.31.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "quick-xml" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "0cravqanylzh5cq2v6hzlfqgxcid5nrp2snnb3pf4m0and2a610h"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-tokio" ,rust-tokio-1)
+         ("rust-serde" ,rust-serde-1)
+         ("rust-encoding-rs" ,rust-encoding-rs-0.8)
+         ("rust-document-features" ,rust-document-features-0.2)
+         ("rust-arbitrary" ,rust-arbitrary-1)
+         ("rust-memchr" ,rust-memchr-2))
+        #:cargo-development-inputs
+        (("rust-tokio-test" ,rust-tokio-test-0.4)
+         ("rust-tokio" ,rust-tokio-1)
+         ("rust-serde-value" ,rust-serde-value-0.7)
+         ("rust-serde-derive" ,rust-serde-derive-1)
+         ("rust-regex" ,rust-regex-1)
+         ("rust-pretty-assertions" ,rust-pretty-assertions-1)
+         ("rust-criterion" ,rust-criterion-0.4))))
+    (home-page "https://github.com/tafia/quick-xml")
+    (synopsis "High performance xml reader and writer")
+    (description
+     "This package provides a high performance XML reader and writer.")
+    (license license:expat)))
+
 (define-public rust-quick-xml-0.28
   (package
+    (inherit rust-quick-xml-0.31)
     (name "rust-quick-xml")
     (version "0.28.2")
     (source
@@ -54926,12 +54961,7 @@ (define-public rust-quick-xml-0.28
         ("rust-serde-value" ,rust-serde-value-0.7)
         ("rust-serde-derive" ,rust-serde-derive-1)
         ("rust-tokio" ,rust-tokio-1)
-        ("rust-tokio-test" ,rust-tokio-test-0.4))))
-    (home-page "https://github.com/tafia/quick-xml")
-    (synopsis "High performance xml reader and writer")
-    (description
-     "This package provides a high performance XML reader and writer.")
-    (license license:expat)))
+        ("rust-tokio-test" ,rust-tokio-test-0.4))))))
 
 (define-public rust-quick-xml-0.27
   (package
-- 
2.41.0

Rémi Teissier wrote on 12 Dec 2023 22:16

[PATCH 08/20] gnu: rust-fancy-regex: Update to 0.11.0.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:8f7bdc3d1b331b5293bd910169b69e94e1606601.1702415473.git.rteissier.code@chillpc.fr

Change-Id: I5cfacdb59ce28565fecc87e1afd8103b3d639c2c

---

gnu/packages/crates-io.scm | 41 ++++++++++++++++++++++++++++----------

1 file changed, 31 insertions(+), 10 deletions(-)

Toggle diff (63 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0c775f196b8..4d2091fd850 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -25182,8 +25182,38 @@ (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.11
+  (package
+    (name "rust-fancy-regex")
+    (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 "18j0mmzfycibhxhhhfja00dxd1vf8x5c28lbry224574h037qpxr"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-regex" ,rust-regex-1)
+         ("rust-bit-set" ,rust-bit-set-0.5))
+        #:cargo-development-inputs
+        (("rust-quickcheck" ,rust-quickcheck-1)
+         ("rust-matches" ,rust-matches-0.1)
+         ("rust-criterion" ,rust-criterion-0.3))))
+    (home-page "https://github.com/fancy-regex/fancy-regex")
+    (synopsis "Implementation of regexes with a rich set of features")
+    (description
+     "This package is a Rust library for compiling and matching regular
+expressions.  It uses a hybrid regex implementation designed to support
+a relatively rich set of features.  In particular, it uses backtracking to
+implement features such as look-around and backtracking, which are not
+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
@@ -25198,16 +25228,7 @@ (define-public rust-fancy-regex-0.7
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-bit-set" ,rust-bit-set-0.5)
-        ("rust-regex" ,rust-regex-1))))
-    (home-page "https://github.com/fancy-regex/fancy-regex")
-    (synopsis "Implementation of regexes with a rich set of features")
-    (description
-     "This package is a Rust library for compiling and matching regular
-expressions.  It uses a hybrid regex implementation designed to support
-a relatively rich set of features.  In particular, it uses backtracking to
-implement features such as look-around and backtracking, which are not
-supported in purely NFA-based implementations.")
-    (license license:expat)))
+        ("rust-regex" ,rust-regex-1))))))
 
 (define-public rust-fast-chemail-0.9
   (package
-- 
2.41.0

Rémi Teissier wrote on 12 Dec 2023 22:16

[PATCH 09/20] gnu: rust-zerocopy-derive: Update to 0.7.29.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:ee10b4c8954360120278ec06a76e65fa8f1da4fe.1702415474.git.rteissier.code@chillpc.fr

Change-Id: I0f0defb596f04e95fee9d3a866a6c4ea483ea2fb

---

gnu/packages/crates-io.scm | 30 +++++++++++++++++++++++++-----

1 file changed, 25 insertions(+), 5 deletions(-)

Toggle diff (63 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4d2091fd850..40151728504 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -85592,24 +85592,24 @@ (define-public rust-zerocopy-0.3
         ("rust-zerocopy-derive" ,rust-zerocopy-derive-0.2))))
     (license license:bsd-3)))
 
-(define-public rust-zerocopy-derive-0.3
+(define-public rust-zerocopy-derive-0.7
   (package
     (name "rust-zerocopy-derive")
-    (version "0.3.2")
+    (version "0.7.29")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "zerocopy-derive" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "18qr7dqlj89v1xl1g58l2xd6jidv0sbccscgl131gpppba0yc1b5"))))
+                "1hmh2fl264i1rdn67jvlx34niyhix3pnbbfk17prfywrfsh5rkc6"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-syn" ,rust-syn-1)
-        ("rust-synstructure" ,rust-synstructure-0.12))))
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-2))))
     (home-page "https://github.com/google/zerocopy")
     (synopsis "Custom derive for traits from the zerocopy Rust crate")
     (description
@@ -85617,6 +85617,26 @@ (define-public rust-zerocopy-derive-0.3
 crate.")
     (license license:bsd-2)))
 
+(define-public rust-zerocopy-derive-0.3
+  (package
+    (inherit rust-zerocopy-derive-0.7)
+    (name "rust-zerocopy-derive")
+    (version "0.3.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "zerocopy-derive" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "18qr7dqlj89v1xl1g58l2xd6jidv0sbccscgl131gpppba0yc1b5"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-syn" ,rust-syn-1)
+        ("rust-synstructure" ,rust-synstructure-0.12))))))
+
 (define-public rust-zerocopy-derive-0.2
   (package
     (inherit rust-zerocopy-derive-0.3)
-- 
2.41.0

Rémi Teissier wrote on 12 Dec 2023 22:16

[PATCH 10/20] gnu: rust-zerocopy: Update to 0.7.29.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:bbd9667e8721a1519e65adaf40441773c0d4dff3.1702415474.git.rteissier.code@chillpc.fr

Change-Id: I17d38bf61e4120f3b4b52be7c945c910b3edf583

---

gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++----

1 file changed, 23 insertions(+), 4 deletions(-)

Toggle diff (58 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 40151728504..fa9ffbb852a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -85551,28 +85551,47 @@ (define-public rust-zbus-polkit-1
     (description "@code{PolicyKit} binding.")
     (license license:expat)))
 
-(define-public rust-zerocopy-0.6
+(define-public rust-zerocopy-0.7
   (package
     (name "rust-zerocopy")
-    (version "0.6.1")
+    (version "0.7.29")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "zerocopy" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0dpj4nd9v56wy93ahjkp95znjzj91waqvidqch8gxwdwq661hbrk"))))
+                "13ll740czgl8h6xlqlsvsp0blii15ywqgq236f9lw4dvbgw5q1sx"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-byteorder" ,rust-byteorder-1)
-        ("rust-zerocopy-derive" ,rust-zerocopy-derive-0.3))))
+        ("rust-zerocopy-derive" ,rust-zerocopy-derive-0.7))))
     (home-page "https://github.com/google/zerocopy")
     (synopsis "Utilities for zero-copy parsing and serialization")
     (description "Utilities for zero-copy parsing and serialization")
     (license license:bsd-2)))
 
+(define-public rust-zerocopy-0.6
+  (package
+    (inherit rust-zerocopy-0.7)
+    (name "rust-zerocopy")
+    (version "0.6.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "zerocopy" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0dpj4nd9v56wy93ahjkp95znjzj91waqvidqch8gxwdwq661hbrk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-byteorder" ,rust-byteorder-1)
+        ("rust-zerocopy-derive" ,rust-zerocopy-derive-0.3))))))
+
 (define-public rust-zerocopy-0.3
   (package
     (inherit rust-zerocopy-0.6)
-- 
2.41.0

Rémi Teissier wrote on 12 Dec 2023 22:16

[PATCH 11/20] gnu: rust-ahash: Update to 0.8.6.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:e25e48137316c0461574cb2c12c970191ccc73cd.1702415474.git.rteissier.code@chillpc.fr

Change-Id: I380e8d6909127da892e2c185a4b2d47f3f3c3639

---

gnu/packages/crates-io.scm | 15 ++++++---------

1 file changed, 6 insertions(+), 9 deletions(-)

Toggle diff (55 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fa9ffbb852a..561f598405d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2557,14 +2557,14 @@ (define-public rust-afl-0.8
 (define-public rust-ahash-0.8
   (package
     (name "rust-ahash")
-    (version "0.8.3")
+    (version "0.8.6")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "ahash" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0bzcsxdl2wd6j2p4214qh9sqkqn69gi7f9lk1xi8yj063r6zd69c"))))
+                "0yn9i8nc6mmv28ig9w3dga571q09vg9f1f650mi5z8phx42r6hli"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -2574,7 +2574,8 @@ (define-public rust-ahash-0.8
         ("rust-getrandom" ,rust-getrandom-0.2)
         ("rust-once-cell" ,rust-once-cell-1)
         ("rust-serde" ,rust-serde-1)
-        ("rust-version-check" ,rust-version-check-0.9))
+        ("rust-version-check" ,rust-version-check-0.9)
+        ("rust-zerocopy" ,rust-zerocopy-0.7))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.3)
         ("rust-fnv" ,rust-fnv-1)
@@ -2595,6 +2596,7 @@ (define-public rust-ahash-0.8
 
 (define-public rust-ahash-0.7
   (package
+    (inherit rust-ahash-0.8)
     (name "rust-ahash")
     (version "0.7.6")
     (source
@@ -2620,12 +2622,7 @@ (define-public rust-ahash-0.7
         ("rust-no-panic" ,rust-no-panic-0.1)
         ("rust-rand" ,rust-rand-0.7)
         ("rust-seahash" ,rust-seahash-4)
-        ("rust-serde-json" ,rust-serde-json-1))))
-    (home-page "https://github.com/tkaitchuck/ahash")
-    (synopsis "Non-cryptographic hash function using AES-NI")
-    (description "This package provides a non-cryptographic hash function
-using AES-NI for high performance.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-serde-json" ,rust-serde-json-1))))))
 
 (define-public rust-ahash-0.4
   (package
-- 
2.41.0

Rémi Teissier wrote on 12 Dec 2023 22:16

[PATCH 12/20] gnu: rust-hashbrown: Update to 0.14.3.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:5bd98b6d6e4effc182d8a850082ba003c9050ef9.1702415474.git.rteissier.code@chillpc.fr

Change-Id: Ic6e773f214af9686d885b3d707b25d5804933d44

---

gnu/packages/crates-io.scm | 5 +++--

1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (31 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 561f598405d..f7280634d68 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30793,14 +30793,14 @@ (define-public rust-hash32-derive-0.1
 (define-public rust-hashbrown-0.14
   (package
     (name "rust-hashbrown")
-    (version "0.14.0")
+    (version "0.14.3")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "hashbrown" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0yj3nf0w30pf30w503kgaw4sbjnh62l5cbmc7dd0mnczzywh2qic"))
+                "012nywlg0lj9kwanh69my5x67vjlfmzfi9a0rq4qvis2j8fil3r9"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -30813,6 +30813,7 @@ (define-public rust-hashbrown-0.14
        (("rust-ahash" ,rust-ahash-0.8)
         ("rust-allocator-api2" ,rust-allocator-api2-0.2)
         ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+        ("rust-equivalent" ,rust-equivalent-1)
         ("rust-rayon" ,rust-rayon-1)
         ("rust-rkyv" ,rust-rkyv-0.7)
         ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
-- 
2.41.0

Rémi Teissier wrote on 12 Dec 2023 22:16

[PATCH 13/20] gnu: rust-indexmap: Update to 2.1.0.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:c05ddf871fab5a25ac2257b6bd6064dbf7270173.1702415474.git.rteissier.code@chillpc.fr

Change-Id: Icae0b1bc04bb5ff2ed50984a8b21591ff0ac060c

---

gnu/packages/crates-io.scm | 48 +++++++++++++++++++-------------------

1 file changed, 24 insertions(+), 24 deletions(-)

Toggle diff (63 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f7280634d68..a2a98d592d1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33803,32 +33803,32 @@ (define-public rust-indenter-0.3
 (define-public rust-indexmap-2
   (package
     (name "rust-indexmap")
-    (version "2.0.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "indexmap" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0pdnbvv6gnyxx2li8mks8p00fya3ynmhx3n6infpcy8a4gi7yiym"))))
+    (version "2.1.0")
+    (source
+      (origin
+         (method url-fetch)
+         (uri (crate-uri "indexmap" version))
+         (file-name (string-append name "-" version ".tar.gz"))
+         (sha256
+           (base32 "07rxrqmryr1xfnmhrjlz8ic6jw28v6h5cig3ws2c9d0wifhy2c6m"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-arbitrary" ,rust-arbitrary-1)
-        ("rust-equivalent" ,rust-equivalent-1)
-        ("rust-hashbrown" ,rust-hashbrown-0.14)
-        ("rust-quickcheck" ,rust-quickcheck-1)
-        ("rust-rayon" ,rust-rayon-1)
-        ("rust-rustc-rayon" ,rust-rustc-rayon-0.5)
-        ("rust-serde" ,rust-serde-1))
-       #:cargo-development-inputs
-       (("rust-fnv" ,rust-fnv-1)
-        ("rust-fxhash" ,rust-fxhash-0.2)
-        ("rust-itertools" ,rust-itertools-0.10)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-quickcheck" ,rust-quickcheck-1)
-        ("rust-rand" ,rust-rand-0.8)
-        ("rust-serde-derive" ,rust-serde-derive-1))))
+      `(#:cargo-inputs
+        (("rust-serde" ,rust-serde-1)
+         ("rust-rustc-rayon" ,rust-rustc-rayon-0.5)
+         ("rust-rayon" ,rust-rayon-1)
+         ("rust-quickcheck" ,rust-quickcheck-1)
+         ("rust-arbitrary" ,rust-arbitrary-1)
+         ("rust-hashbrown" ,rust-hashbrown-0.14)
+         ("rust-equivalent" ,rust-equivalent-1))
+        #:cargo-development-inputs
+        (("rust-serde-derive" ,rust-serde-derive-1)
+         ("rust-rand" ,rust-rand-0.8)
+         ("rust-quickcheck" ,rust-quickcheck-1)
+         ("rust-lazy-static" ,rust-lazy-static-1)
+         ("rust-itertools" ,rust-itertools-0.11)
+         ("rust-fxhash" ,rust-fxhash-0.2)
+         ("rust-fnv" ,rust-fnv-1))))
     (home-page "https://github.com/bluss/indexmap")
     (synopsis "Hash table with consistent order and fast iteration")
     (description
-- 
2.41.0

Rémi Teissier wrote on 12 Dec 2023 22:16

[PATCH 15/20] gnu: rust-plist: Update to 1.6.0.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:776b431a136126c31292fb63bcabfebc46523e92.1702415474.git.rteissier.code@chillpc.fr

Change-Id: I21370583950a25f4f5b154def6f50e6ebd26e4b5

---

gnu/packages/crates-io.scm | 21 ++++++++++++---------

1 file changed, 12 insertions(+), 9 deletions(-)

Toggle diff (42 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 062dfc01f6e..8d36d464663 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51739,23 +51739,26 @@ (define-public rust-pledge-0.4
 (define-public rust-plist-1
   (package
     (name "rust-plist")
-    (version "1.0.0")
+    (version "1.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "plist" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1zb7k48x1zf1dhqavs37qm24fxi98qb978xv2nzjkkp4x2a6scvv"))))
+         (base32 "1vscdjj7xy1pz80n3lwcg1jhsydcf2nvj4lfxsqs46ixlv49qsg5"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-base64" ,rust-base64-0.12)
-        ("rust-chrono" ,rust-chrono-0.4)
-        ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-line-wrap" ,rust-line-wrap-0.1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-xml-rs" ,rust-xml-rs-0.8))))
+      `(#:cargo-inputs
+        (("rust-base64" ,rust-base64-0.21)
+         ("rust-indexmap" ,rust-indexmap-2)
+         ("rust-line-wrap" ,rust-line-wrap-0.1)
+         ("rust-quick-xml" ,rust-quick-xml-0.31)
+         ("rust-serde" ,rust-serde-1)
+         ("rust-time" ,rust-time-0.3))
+        #:cargo-development-inputs
+        (("rust-serde-derive" ,rust-serde-derive-1)
+         ("rust-serde-yaml" ,rust-serde-yaml-0.8))))
     (home-page "https://github.com/ebarnard/rust-plist/")
     (synopsis "Rusty plist parser")
     (description
-- 
2.41.0

Rémi Teissier wrote on 12 Dec 2023 22:16

[PATCH 14/20] gnu: Add rust-syntect.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:a6d265713735ef0276dd57a46c9c5c111bb9b91d.1702415474.git.rteissier.code@chillpc.fr

Change-Id: I5c6ef2044f6a39e88d9ecc6f64d35117d5791aae

---

gnu/packages/crates-io.scm | 42 ++++++++++++++++++++++++++++++++++++++

1 file changed, 42 insertions(+)

Toggle diff (55 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a2a98d592d1..062dfc01f6e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -71179,6 +71179,48 @@ (define-public rust-syn-test-suite-0.0.0
     (description "Test suite of the syn crate.")
     (license (list license:expat license:asl2.0))))
 
+(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
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-yaml-rust" ,rust-yaml-rust-0.4)
+                       ("rust-regex-syntax" ,rust-regex-syntax-0.7)
+                       ("rust-plist" ,rust-plist-1)
+                       ("rust-onig" ,rust-onig-6)
+                       ("rust-fnv" ,rust-fnv-1)
+                       ("rust-flate2" ,rust-flate2-1)
+                       ("rust-fancy-regex" ,rust-fancy-regex-0.11)
+                       ("rust-bincode" ,rust-bincode-1)
+                       ("rust-walkdir" ,rust-walkdir-2)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-bitflags" ,rust-bitflags-1))
+       #:cargo-development-inputs (("rust-regex" ,rust-regex-1)
+                                   ("rust-rayon" ,rust-rayon-1)
+                                   ("rust-pretty-assertions" ,rust-pretty-assertions-0.6)
+                                   ("rust-getopts" ,rust-getopts-0.2)
+                                   ("rust-criterion" ,rust-criterion-0.3))))
+    (home-page "https://github.com/trishume/syntect")
+    (synopsis
+     "Library for high quality syntax highlighting and code intelligence using Sublime Text's grammars")
+    (description
+     "syntect is a syntax highlighting library for Rust that uses Sublime Text syntax
+definitions. It aims to be a good solution for any Rust project that needs syntax highligting,
+including deep integration with text editors written in Rust.")
+    (license license:expat)))
+
 (define-public rust-synchronoise-1
   (package
     (name "rust-synchronoise")
-- 
2.41.0

Rémi Teissier wrote on 12 Dec 2023 22:16

[PATCH 17/20] gnu: Add rust-powerfmt.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:b65648e35634be32c06b45832ce963960fadedab.1702415474.git.rteissier.code@chillpc.fr

Change-Id: I8f61d123f4db068ca629d50416fb4188a4dcb857

---

gnu/packages/crates-io.scm | 21 +++++++++++++++++++++

1 file changed, 21 insertions(+)

Toggle diff (34 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4a6a24f73fb..98011b82c56 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -52439,6 +52439,27 @@ (define-public rust-postgres-types-0.2
 and Postgres values.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-powerfmt-0.2
+  (package
+    (name "rust-powerfmt")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "powerfmt" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "14ckj2xdpkhv3h6l5sdmb9f1d57z8hbfpdldjc2vl5givq2y77j3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-powerfmt-macros" ,rust-powerfmt-macros-0.1))))
+    (home-page "https://github.com/jhpratt/powerfmt")
+    (synopsis "Library that provides utilities for formatting values")
+    (description
+     "This crate makes it significantly easier to support filling to a minimum
+width with alignment, avoid heap allocation, and avoid repetitive calculations.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-powerfmt-macros-0.1
   (package
     (name "rust-powerfmt-macros")
-- 
2.41.0

Rémi Teissier wrote on 12 Dec 2023 22:16

[PATCH 16/20] gnu: Add rust-powerfmt-macros.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:abc9fa69c880571cbc6e86bfc9cd8c4da0caac39.1702415474.git.rteissier.code@chillpc.fr

Change-Id: I6b5dc0acb9444fb2614000507ac96d0b96389ce1

---

gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++

1 file changed, 22 insertions(+)

Toggle diff (35 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8d36d464663..4a6a24f73fb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -52439,6 +52439,28 @@ (define-public rust-postgres-types-0.2
 and Postgres values.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-powerfmt-macros-0.1
+  (package
+    (name "rust-powerfmt-macros")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "powerfmt-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "097ir0g2hjq6sx20nc3k7r7cnyyflgn5lv64jmghyp5g63i5bwx8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-syn" ,rust-syn-2)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1))))
+    (home-page "https://github.com/jhpratt/powerfmt")
+    (synopsis "Procedural macros for @code{powerfmt}")
+    (description
+     "This crate is an implementation detail and should not be relied upon directly.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-ppv-lite86-0.2
   (package
     (name "rust-ppv-lite86")
-- 
2.41.0

Rémi Teissier wrote on 12 Dec 2023 22:16

[PATCH 18/20] gnu: rust-libssh2-sys: Update 0.3.0.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:6971a2f8f298e9b687e2bc1f08a20664f670a737.1702415474.git.rteissier.code@chillpc.fr

Change-Id: I36d0e03fb2ad2c349fb621e128440c9eb9204131

---

gnu/packages/crates-io.scm | 41 +++++++++++++++++++++++++++++++++-----

1 file changed, 36 insertions(+), 5 deletions(-)

Toggle diff (70 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 98011b82c56..db0ec90a658 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38640,10 +38640,10 @@ (define-public rust-linux-raw-sys-0.0.46
            `(("rust-libc" ,rust-libc-0.2)
              ("rust-static-assertions" ,rust-static-assertions-1))))))
 
-(define-public rust-libssh2-sys-0.2
+(define-public rust-libssh2-sys-0.3
   (package
     (name "rust-libssh2-sys")
-    (version "0.2.19")
+    (version "0.3.0")
     (source
       (origin
         (method url-fetch)
@@ -38651,7 +38651,7 @@ (define-public rust-libssh2-sys-0.2
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "0mkhw4pksbz7gldj8hia7k6npc479n1x09i8r0pm275sac424ina"))
+          "1vkidqw5ll71ynqc93hgcq62iqkklzb5268zffd13ql7nwqa1j1d"))
         (modules '((guix build utils)))
         (snippet
          '(begin (delete-file-recursively "libssh2") #t))))
@@ -38673,8 +38673,39 @@ (define-public rust-libssh2-sys-0.2
     (synopsis "Native bindings to the libssh2 library")
     (description
      "This package provides native rust bindings to the @code{libssh2} library.")
-    (license (list license:asl2.0
-                   license:expat))))
+    (license
+      (list license:asl2.0 license:expat))))
+
+(define-public rust-libssh2-sys-0.2
+  (package
+    (inherit rust-libssh2-sys-0.3)
+    (name "rust-libssh2-sys")
+    (version "0.2.19")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "libssh2-sys" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0mkhw4pksbz7gldj8hia7k6npc479n1x09i8r0pm275sac424ina"))
+        (modules '((guix build utils)))
+        (snippet
+         '(begin (delete-file-recursively "libssh2") #t))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-libz-sys" ,rust-libz-sys-1)
+        ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+        ;; Build dependencies:
+        ("rust-cc" ,rust-cc-1)
+        ("rust-pkg-config" ,rust-pkg-config-0.3)
+        ("rust-vcpkg" ,rust-vcpkg-0.2))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list libssh2 openssl zlib))))
 
 (define-public rust-libtest-mimic-0.6
   (package
-- 
2.41.0

Rémi Teissier wrote on 12 Dec 2023 22:16

[PATCH 19/20] gnu: rust-libgit2-sys: Update to 0.16.1+1.7.1.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:c227d508347c0b6137647d9ede1f3544110f0e12.1702415474.git.rteissier.code@chillpc.fr

Change-Id: I683fd8785dda47fecb07809e50b69aa872ad37c7

---

gnu/packages/crates-io.scm | 71 ++++++++++++++++++++++++++++++++++----

1 file changed, 64 insertions(+), 7 deletions(-)

Toggle diff (93 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index db0ec90a658..23d106464c6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37191,8 +37191,71 @@ (define-public rust-libfuzzer-sys-0.3
     (license
      (list license:expat license:asl2.0 license:ncsa))))
 
+(define-public rust-libgit2-sys-0.16
+  (package
+    (name "rust-libgit2-sys")
+    (version "0.16.1+1.7.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libgit2-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "030dnq7hz79qs4rxdllc3ailvqzc432jwwxk7g8av55hh0vbp8pj"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   (delete-file-recursively "libgit2")))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libssh2-sys" ,rust-libssh2-sys-0.3)
+                       ("rust-libz-sys" ,rust-libz-sys-1)
+                       ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3))))
+    (native-inputs (list pkg-config))
+    (inputs (list libgit2 openssl zlib))
+    (home-page "https://github.com/rust-lang/git2-rs")
+    (synopsis "Native bindings to the libgit2 library")
+    (description
+     "This package provides native Rust bindings to the @code{libgit2}
+library.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-libgit2-sys-0.15
+  (package
+    (inherit rust-libgit2-sys-0.16)
+    (name "rust-libgit2-sys")
+    (version "0.15.2+1.6.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libgit2-sys" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1yllyq9wiryy257cfx8s7wadls24yzkxnhmbl95iz9ml3zhz43d8"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin (delete-file-recursively "libgit2")))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cc" ,rust-cc-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-libssh2-sys" ,rust-libssh2-sys-0.3)
+        ("rust-libz-sys" ,rust-libz-sys-1)
+        ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+        ("rust-pkg-config" ,rust-pkg-config-0.3))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list libgit2-1.6 openssl zlib))))
+
 (define-public rust-libgit2-sys-0.14
   (package
+    (inherit rust-libgit2-sys-0.15)
     (name "rust-libgit2-sys")
     (version "0.14.2+1.5.1")
     (source
@@ -37219,13 +37282,7 @@ (define-public rust-libgit2-sys-0.14
     (native-inputs
      (list pkg-config))
     (inputs
-     (list libgit2 openssl zlib))
-    (home-page "https://github.com/rust-lang/git2-rs")
-    (synopsis "Native bindings to the libgit2 library")
-    (description
-     "This package provides native Rust bindings to the @code{libgit2}
-library.")
-    (license (list license:expat license:asl2.0))))
+     (list libgit2-1.5 openssl zlib))))
 
 (define-public rust-libgit2-sys-0.13
   (package
-- 
2.41.0

Rémi Teissier wrote on 12 Dec 2023 22:16

[PATCH 20/20] gnu: rust-git2: Update to 0.18.1.

Recipients:(address . 67592@debbugs.gnu.org)(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)

Message-ID:26db4cf2525ae303d21d5227d8d614d66f81433b.1702415474.git.rteissier.code@chillpc.fr

Change-Id: Id22471f11ee0f59322771e8ca73611d330ffb783

---

gnu/packages/crates-io.scm | 84 ++++++++++++++++++++++++++++++++++----

1 file changed, 75 insertions(+), 9 deletions(-)

Toggle diff (130 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 23d106464c6..9b1d47f450c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -29250,10 +29250,10 @@ (define-public rust-git-version-macro-0.3
      "This is an internal macro crate for git-version.")
     (license license:bsd-2)))
 
-(define-public rust-git2-0.16
+(define-public rust-git2-0.18
   (package
     (name "rust-git2")
-    (version "0.16.1")
+    (version "0.18.1")
     (source
      (origin
        (method url-fetch)
@@ -29261,22 +29261,21 @@ (define-public rust-git2-0.16
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1k1aavsfhk0i9jycc9gb61w2jwy8w9dgkd7zkz295wwm566gdxyc"))))
+        (base32 "1kf0kvg3i7p1223zs2h9fz99ndm0l9kdx3hcw63g73dh5nlppygv"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bitflags" ,rust-bitflags-1)
         ("rust-libc" ,rust-libc-0.2)
-        ("rust-libgit2-sys" ,rust-libgit2-sys-0.14)
+        ("rust-libgit2-sys" ,rust-libgit2-sys-0.16)
         ("rust-log" ,rust-log-0.4)
         ("rust-openssl-probe" ,rust-openssl-probe-0.1)
         ("rust-openssl-sys" ,rust-openssl-sys-0.9)
         ("rust-url" ,rust-url-2))
        #:cargo-development-inputs
-       (("rust-paste" ,rust-paste-1)
-        ("rust-structopt" ,rust-structopt-0.3)
-        ("rust-tempfile" ,rust-tempfile-3)
-        ("rust-time" ,rust-time-0.1))))
+       (("rust-structopt" ,rust-structopt-0.3)
+         ("rust-tempfile" ,rust-tempfile-3)
+         ("rust-time" ,rust-time-0.1))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("git" ,git-minimal)))           ;for a single test
@@ -29290,6 +29289,73 @@ (define-public rust-git2-0.16
 reading and writing git repositories.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-git2-0.17
+  (package
+    (inherit rust-git2-0.18)
+    (name "rust-git2")
+    (version "0.17.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "git2" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0i00kg3yizh7mn6hnj3yz3hpniisidlavifgy8n3cnm9gim9v63v"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-libgit2-sys" ,rust-libgit2-sys-0.15)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-openssl-probe" ,rust-openssl-probe-0.1)
+        ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+        ("rust-url" ,rust-url-2))
+       #:cargo-development-inputs
+       (("rust-structopt" ,rust-structopt-0.3)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-time" ,rust-time-0.1))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("git" ,git-minimal)))           ;for a single test
+    (inputs
+     (list libgit2-1.6 libssh2 openssl zlib))))
+
+(define-public rust-git2-0.16
+  (package
+    (inherit rust-git2-0.17)
+    (name "rust-git2")
+    (version "0.16.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "git2" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1k1aavsfhk0i9jycc9gb61w2jwy8w9dgkd7zkz295wwm566gdxyc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-libgit2-sys" ,rust-libgit2-sys-0.14)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-openssl-probe" ,rust-openssl-probe-0.1)
+        ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+        ("rust-url" ,rust-url-2))
+       #:cargo-development-inputs
+       (("rust-paste" ,rust-paste-1)
+        ("rust-structopt" ,rust-structopt-0.3)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-time" ,rust-time-0.1))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("git" ,git-minimal)))           ;for a single test
+    (inputs
+     (list libgit2-1.5 libssh2 openssl zlib))))
+
 (define-public rust-git2-0.15
   (package
     (inherit rust-git2-0.16)
@@ -29322,7 +29388,7 @@ (define-public rust-git2-0.15
      `(("pkg-config" ,pkg-config)
        ("git" ,git-minimal)))           ;for a single test
     (inputs
-     (list libgit2 libssh2 openssl zlib))))
+     (list libgit2-1.5 libssh2 openssl zlib))))
 
 (define-public rust-git2-0.14
   (package
-- 
2.41.0

Efraim Flashner wrote on 21 Dec 2023 10:28

Re: [bug#67592] [PATCH 00/20] gnu: rust-git2: Update to 0.18.1

Recipients:(name . Rémi Teissier)(address . rteissier.code@chillpc.fr)(address . 67592-done@debbugs.gnu.org)

Message-ID:ZYQFI3numsYHw0_u@3900XT

On Tue, Dec 12, 2023 at 10:16:38PM +0100, Rémi Teissier wrote:

Toggle quote (30 lines)> *** BLURB HERE ***
> 
> Rémi Teissier (20):
>   gnu: rust-time-core: Update to 0.1.2.
>   gnu: rust-rstest-macros: Update to 0.18.2.
>   gnu: rust-rstest: Update to 0.18.2.
>   gnu: rust-time: Update to 0.3.30.
>   gnu: rust-quick-xml: Update to 0.31.0.
>   gnu: Add rust-bugreport.
>   gnu: Add rust-deranged.
>   gnu: rust-fancy-regex: Update to 0.11.0.
>   gnu: rust-zerocopy-derive: Update to 0.7.29.
>   gnu: rust-zerocopy: Update to 0.7.29.
>   gnu: rust-ahash: Update to 0.8.6.
>   gnu: rust-hashbrown: Update to 0.14.3.
>   gnu: rust-indexmap: Update to 2.1.0.
>   gnu: Add rust-syntect.
>   gnu: rust-plist: Update to 1.6.0.
>   gnu: Add rust-powerfmt-macros.
>   gnu: Add rust-powerfmt.
>   gnu: rust-libssh2-sys: Update 0.3.0.
>   gnu: rust-libgit2-sys: Update to 0.16.1+1.7.1.
>   gnu: rust-git2: Update to 0.18.1.
> 
>  gnu/packages/crates-io.scm | 785 +++++++++++++++++++++++++++++++------
>  1 file changed, 655 insertions(+), 130 deletions(-)
> 
> 
> base-commit: deac1e8618780b8d2aa09355884f915808ea8a5b

rust-git2 is now already in Guix so I'm going to close this bug. Feel
free to rebase any of the patches on top of the new master or to
continue on to the next crate you're looking to package.

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

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 67592@debbugs.gnu.org

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date