[PATCH 00/32] various Rust updates and additions

Done

Details

3 participants

Arjan Adriaanse
Efraim Flashner
Tyler Wolf

Owner: unassigned

Submitted by: Arjan Adriaanse

Severity: normal

Arjan Adriaanse wrote on 4 Mar 2023 14:50

Recipients:(address . guix-patches@gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:cover.1677936690.git.arjan@adriaan.se

These are some package additions and updates that are required for updating
the "rbw" Rust package, which is a work in progress but taking some time.  The
changes can be useful on their own, have had basic testing and can be applied
in this order.

Arjan Adriaanse (32):
  gnu: Add rust-block-padding-0.3.
  gnu: Add rust-inout-0.1.
  gnu: rust-typenum-1: Update to 1.16.0.
  gnu: rust-crypto-common-0.1: Update to 0.1.6.
  gnu: Add rust-cipher-0.4.
  gnu: Add rust-aes-0.8.
  gnu: Add rust-anes-0.1.
  gnu: Add rust-rstest-0.11.
  gnu: Add rust-ciborium-io-0.2.
  gnu: Add rust-ciborium-ll-0.2.
  gnu: Add rust-ciborium-0.2.
  gnu: Add rust-criterion-plot-0.5.
  gnu: Add rust-criterion-0.4.
  gnu: rust-rand-0.8: Update to 0.8.5.
  gnu: Add rust-rstest-0.12.
  gnu: Add rust-rstest-reuse-0.3.
  gnu: Add rust-base64-0.21.
  gnu: rust-serde-1: Update to 1.0.139.
  gnu: rust-serde-derive-1: Update to 1.0.139.
  gnu: Add rust-basic-toml-0.1.
  gnu: rust-trybuild-1: Update to 1.0.77.
  gnu: rust-anyhow-1: Update to 1.0.69.
  gnu: rust-async-trait-0.1: Update to 0.1.64.
  gnu: Add rust-cbc-0.1.
  gnu: Add rust-windows-targets-0.42.
  gnu: Add rust-windows-sys-0.45.
  gnu: Add rust-linux-raw-sys-0.1.
  gnu: rust-os-pipe-1: Update to 1.1.3.
  gnu: Add rust-io-lifetimes-1.
  gnu: Add rust-rustix-0.36.
  gnu: Add rust-hermit-abi-0.3.
  gnu: Add rust-is-terminal-0.4.

 gnu/packages/crates-io.scm | 720 +++++++++++++++++++++++++++++++------
 1 file changed, 614 insertions(+), 106 deletions(-)


base-commit: 2799ad44234be675f018115f99be98d2c9fd565d
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 14:53

[PATCH 01/32] gnu: Add rust-block-padding-0.3.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:32d2dc22943871c0d4744324a988e16794cf488a.1677936690.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-block-padding-0.3): New variable.
(rust-block-padding-0.2): Inherit from above.
---
 gnu/packages/crates-io.scm | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

Toggle diff (51 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index df8ec29022..26ac0d295d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -7573,10 +7573,10 @@ (define-public rust-block-modes-0.7
        (("rust-aes" ,rust-aes-0.6)
         ("rust-hex-literal" ,rust-hex-literal-0.2))))))
 
-(define-public rust-block-padding-0.2
+(define-public rust-block-padding-0.3
   (package
     (name "rust-block-padding")
-    (version "0.2.0")
+    (version "0.3.2")
     (source
       (origin
         (method url-fetch)
@@ -7585,14 +7585,30 @@ (define-public rust-block-padding-0.2
          (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "0x6b2dgink7rc3755r8jl4kmndydy5563h3wz7z9jqrb25ygv2y9"))))
+          "0y5v92alqzn9ikmyqfl3a4j6va87j967ii2n3jh2h330z4nyr40a"))))
     (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-generic-array" ,rust-generic-array-0.14))))
     (home-page "https://github.com/RustCrypto/utils")
     (synopsis "Padding and unpadding of messages divided into blocks")
     (description
      "Padding and unpadding of messages divided into blocks.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-block-padding-0.2
+  (package
+    (inherit rust-block-padding-0.3)
+    (name "rust-block-padding")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "block-padding" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0x6b2dgink7rc3755r8jl4kmndydy5563h3wz7z9jqrb25ygv2y9"))))))
+
 (define-public rust-block-padding-0.1
   (package
     (inherit rust-block-padding-0.2)
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 14:53

[PATCH 02/32] gnu: Add rust-inout-0.1.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:37071d444fc847c9dea52a921eab634ecd8ef733.1677936690.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-inout-0.1): New variable.

---

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

1 file changed, 24 insertions(+)

Toggle diff (37 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 26ac0d295d..5cf0ac28d9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -27672,6 +27672,30 @@ (define-public rust-inotify-sys-0.1
      "This package provides inotify bindings for the Rust programming language.")
     (license license:isc)))
 
+(define-public rust-inout-0.1
+  (package
+    (name "rust-inout")
+    (version "0.1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "inout" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1xf9gf09nc7y1a261xlfqsf66yn6mb81ahlzzyyd1934sr9hbhd0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-block-padding" ,rust-block-padding-0.3)
+        ("rust-generic-array" ,rust-generic-array-0.14))))
+    (home-page "https://github.com/RustCrypto/utils")
+    (synopsis
+     "Custom reference types for code generic over several modes of operation")
+    (description
+     "This package provides custom reference types for code generic over
+in-place and buffer-to-buffer modes of operation.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-input-buffer-0.3
   (package
     (name "rust-input-buffer")
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 14:53

[PATCH 03/32] gnu: rust-typenum-1: Update to 1.16.0.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:bc2776036433d6ac6f530dd8f123c2299d48d1dd.1677936690.git.arjan@adriaan.se

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

---

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

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

Toggle diff (24 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5cf0ac28d9..2676278800 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64010,7 +64010,7 @@ (define-public rust-typemap-0.3
 (define-public rust-typenum-1
   (package
     (name "rust-typenum")
-    (version "1.12.0")
+    (version "1.16.0")
     (source
       (origin
         (method url-fetch)
@@ -64018,7 +64018,7 @@ (define-public rust-typenum-1
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "0cvbksljz61ian21fnn0h51kphl0pwpzb932bv4s0rwy1wh8lg1p"))))
+          "1fhb9iaqyjn4dzn2vl86kxjhp4xpw5gynczlnqzf4x6rjgpn2ya9"))))
     (build-system cargo-build-system)
     (home-page "https://github.com/paholg/typenum")
     (synopsis "Rust library for type-level numbers evaluated at compile time")
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 14:53

[PATCH 04/32] gnu: rust-crypto-common-0.1: Update to 0.1.6.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:f3a1eaa79417a1278dfc7fdadb30fe665998bb5a.1677936690.git.arjan@adriaan.se

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

---

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

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

Toggle diff (23 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2676278800..6bae1c146e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14110,14 +14110,14 @@ (define-public rust-crypto-bigint-0.2
 (define-public rust-crypto-common-0.1
   (package
     (name "rust-crypto-common")
-    (version "0.1.1")
+    (version "0.1.6")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "crypto-common" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32 "1l4q4ync13i056vjc775v0za8qh987da7yvrjj25q909cd9nngb8"))))
+          (base32 "1cvby95a6xg7kxdz5ln3rl9xh66nz66w46mm3g56ri1z5x815yqv"))))
     (build-system cargo-build-system)
     (arguments
       `(#:skip-build?
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 14:54

[PATCH 07/32] gnu: Add rust-anes-0.1.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:7bcb6a58c8d1ef95738bf0d2bcb2b1f5bd1208be.1677936691.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-anes-0.1): New variable.

---

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

1 file changed, 18 insertions(+)

Toggle diff (31 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1845390e32..1ff63e0a2f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2698,6 +2698,24 @@ (define-public rust-android-logger-0.8
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-log" ,rust-log-0.4))))))
 
+(define-public rust-anes-0.1
+  (package
+    (name "rust-anes")
+    (version "0.1.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "anes" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ad5v1fna725ppavc0c2b0vrpkvjq37vcl81bg0vw8sdyzdbf3dn"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/zrzka/anes-rs")
+    (synopsis "ANSI Escape Sequences provider & parser")
+    (description "This package provides an ANSI Escape Sequences provider &
+parser.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-ansi-parser-0.6
   (package
     (name "rust-ansi-parser")
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 14:53

[PATCH 05/32] gnu: Add rust-cipher-0.4.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:007443456076b9083de928fd985f7e113e19de7c.1677936690.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-cipher-0.4): New variable.
(rust-cipher-0.3): Inherit from above.
---
 gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

Toggle diff (61 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6bae1c146e..a4d0f4eae5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -10343,10 +10343,10 @@ (define-public rust-clang-sys-1
     (description "This package provides Rust bindings for libclang.")
     (license license:asl2.0)))
 
-(define-public rust-cipher-0.3
+(define-public rust-cipher-0.4
   (package
     (name "rust-cipher")
-    (version "0.3.0")
+    (version "0.4.3")
     (source
       (origin
         (method url-fetch)
@@ -10354,12 +10354,14 @@ (define-public rust-cipher-0.3
         (file-name
          (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32 "1dyzsv0c84rgz98d5glnhsz4320wl24x3bq511vnyf0mxir21rby"))))
+         (base32 "17mmmqaalirdx7bpdhrgzp1sd392zm08mjrr24cjr57pz1q351yi"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
         (("rust-blobby" ,rust-blobby-0.3)
-         ("rust-generic-array" ,rust-generic-array-0.14))))
+         ("rust-crypto-common" ,rust-crypto-common-0.1)
+         ("rust-inout" ,rust-inout-0.1)
+         ("rust-zeroize" ,rust-zeroize-1))))
     (home-page "https://docs.rs/cipher/")
     (synopsis "Traits for describing block ciphers and stream ciphers")
     (description "This package provides traits which define the functionality
@@ -10368,6 +10370,24 @@ (define-public rust-cipher-0.3
 traits.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-cipher-0.3
+  (package
+    (inherit rust-cipher-0.4)
+    (name "rust-cipher")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cipher" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1dyzsv0c84rgz98d5glnhsz4320wl24x3bq511vnyf0mxir21rby"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-blobby" ,rust-blobby-0.3)
+        ("rust-generic-array" ,rust-generic-array-0.14))))))
+
 (define-public rust-cipher-0.2
   (package
     (inherit rust-cipher-0.3)
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 14:54

[PATCH 09/32] gnu: Add rust-ciborium-io-0.2.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:7e505ea11524a32042f917b22c53def048764385.1677936691.git.arjan@adriaan.se

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

---

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

1 file changed, 18 insertions(+)

Toggle diff (31 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 633f96bc80..df06c5f1ac 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -10306,6 +10306,24 @@ (define-public rust-ci-info-0.3
      "This package provides current CI environment information.")
     (license license:asl2.0)))
 
+(define-public rust-ciborium-io-0.2
+  (package
+    (name "rust-ciborium-io")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ciborium-io" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0sdkk7l7pqi2nsbm9c6g8im1gb1qdd83l25ja9xwhg07mx9yfv9l"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/enarx/ciborium")
+    (synopsis "Simplified Read/Write traits for no_std usage")
+    (description "This package provides simplified Read/Write traits for
+no_std usage.")
+    (license license:asl2.0)))
+
 (define-public rust-clang-ast-0.1
   (package
     (name "rust-clang-ast")
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 14:54

[PATCH 08/32] gnu: Add rust-rstest-0.11.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:737fa24d377ea5bb236e79abaaf0d581db89e291.1677936691.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-rstest-0.11): New variable.
(rust-rstest-0.10): Inherit from above.
---
 gnu/packages/crates-io.scm | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

Toggle diff (48 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1ff63e0a2f..633f96bc80 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -47551,18 +47551,18 @@ (define-public rust-rstest-0.15
 and table-based tests.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-rstest-0.10
+(define-public rust-rstest-0.11
   (package
     (inherit rust-rstest-0.15)
     (name "rust-rstest")
-    (version "0.10.0")
+    (version "0.11.0")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "rstest" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1bwhy92fsqc05y8x9iyyq9sykinh0gxnl25zpdca3xhl5hhb06q4"))))
+                "02nh4kpfg1j4v95fhc0bxx9ak3wnz5jg70f94z92wfzyx9mcd212"))))
     (arguments
      (list #:skip-build? #t
            #:cargo-inputs
@@ -47572,6 +47572,19 @@ (define-public rust-rstest-0.10
              ("rust-rustc-version" ,rust-rustc-version-0.3)
              ("rust-syn" ,rust-syn-1))))))
 
+(define-public rust-rstest-0.10
+  (package
+    (inherit rust-rstest-0.11)
+    (name "rust-rstest")
+    (version "0.10.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rstest" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1bwhy92fsqc05y8x9iyyq9sykinh0gxnl25zpdca3xhl5hhb06q4"))))))
+
 (define-public rust-rstest-0.6
   (package
     (inherit rust-rstest-0.10)
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 14:54

[PATCH 06/32] gnu: Add rust-aes-0.8.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:a63a76c9223587987f2958b8ef6085c1f6df5f05.1677936691.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-aes-0.8): New variable.
(rust-aes-0.7): Inherit from above.
---
 gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

Toggle diff (65 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a4d0f4eae5..1845390e32 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1836,32 +1836,52 @@ (define-public rust-aead-0.2
        (("rust-generic-array" ,rust-generic-array-0.12)
         ("rust-heapless" ,rust-heapless-0.5))))))
 
-(define-public rust-aes-0.7
+(define-public rust-aes-0.8
   (package
     (name "rust-aes")
-    (version "0.7.5")
+    (version "0.8.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "aes" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1f0sdx2fsa8w3l7xzsyi9ry3shvnnsgc0znh50if9fm95vslg2wy"))))
+        (base32 "0haj74iqjjhxz4s6yh3v21s68snn74y93ji5d9bnr66921kzsg23"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-cfg-if" ,rust-cfg-if-1)
-        ("rust-cipher" ,rust-cipher-0.3)
+        ("rust-cipher" ,rust-cipher-0.4)
         ("rust-cpufeatures" ,rust-cpufeatures-0.2)
-        ("rust-ctr" ,rust-ctr-0.8)
-        ("rust-opaque-debug" ,rust-opaque-debug-0.3))))
+        ("rust-zeroize" ,rust-zeroize-1))))
     (home-page "https://github.com/RustCrypto/block-ciphers")
     (synopsis "Facade for AES (Rijndael) block ciphers implementations")
     (description "This package provides a facade for AES (Rijndael) block
 ciphers implementations.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-aes-0.7
+  (package
+    (inherit rust-aes-0.8)
+    (name "rust-aes")
+    (version "0.7.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "aes" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1f0sdx2fsa8w3l7xzsyi9ry3shvnnsgc0znh50if9fm95vslg2wy"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-cipher" ,rust-cipher-0.3)
+        ("rust-cpufeatures" ,rust-cpufeatures-0.2)
+        ("rust-ctr" ,rust-ctr-0.8)
+        ("rust-opaque-debug" ,rust-opaque-debug-0.3))))))
+
 (define-public rust-aes-0.6
   (package
     (inherit rust-aes-0.7)
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:00

[PATCH 10/32] gnu: Add rust-ciborium-ll-0.2.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:044e16645f0a7e9c850a7246d97e9744e9a590de.1677936691.git.arjan@adriaan.se

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

---

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 df06c5f1ac..935a1b9da0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -10324,6 +10324,28 @@ (define-public rust-ciborium-io-0.2
 no_std usage.")
     (license license:asl2.0)))
 
+(define-public rust-ciborium-ll-0.2
+  (package
+    (name "rust-ciborium-ll")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ciborium-ll" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06ygqh33k3hp9r9mma43gf189b6cyq62clk65f4w1q54nni30c11"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-ciborium-io" ,rust-ciborium-io-0.2)
+        ("rust-half" ,rust-half-1)
+        ("rust-half" ,rust-hex-0.4))))
+    (home-page "https://github.com/enarx/ciborium")
+    (synopsis "Low-level CBOR codec primitives")
+    (description "This package provides low-level CBOR codec primitives.")
+    (license license:asl2.0)))
+
 (define-public rust-clang-ast-0.1
   (package
     (name "rust-clang-ast")
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:00

[PATCH 11/32] gnu: Add rust-ciborium-0.2.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:ba49904c216ca13de723b51cfd2399d82c635d82.1677936691.git.arjan@adriaan.se

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

---

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

1 file changed, 28 insertions(+)

Toggle diff (41 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 935a1b9da0..08424cbdf8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -10306,6 +10306,34 @@ (define-public rust-ci-info-0.3
      "This package provides current CI environment information.")
     (license license:asl2.0)))
 
+(define-public rust-ciborium-0.2
+  (package
+    (name "rust-ciborium")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ciborium" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "13vqkm88kaq8nvxhaj6qsl0gsc16rqsin014fx5902y6iib3ghdh"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-ciborium-io" ,rust-ciborium-io-0.2)
+        ("rust-ciborium-ll" ,rust-ciborium-ll-0.2)
+        ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-hex" ,rust-hex-0.4)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rstest" ,rust-rstest-0.11)
+        ("rust-serde-bytes" ,rust-serde-bytes-0.11))))
+    (home-page "https://github.com/enarx/ciborium")
+    (synopsis "Serde implementation of CBOR using ciborium-basic")
+    (description "This package provides a serde implementation of CBOR using
+ciborium-basic")
+    (license license:asl2.0)))
+
 (define-public rust-ciborium-io-0.2
   (package
     (name "rust-ciborium-io")
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:00

[PATCH 13/32] gnu: Add rust-criterion-0.4.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:12fe6596576f99b12e7c2c8f972909c195fb0787.1677936691.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-criterion-0.4): New variable.
(rust-criterion-0.3): Inherit from above.
---
 gnu/packages/crates-io.scm | 58 +++++++++++++++++++++++++++++++++-----
 1 file changed, 51 insertions(+), 7 deletions(-)

Toggle diff (87 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 00e5047cfc..affee8fdf1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -13398,8 +13398,58 @@ (define-public rust-crc64-1
 Rust.")
     (license license:bsd-3)))
 
+(define-public rust-criterion-0.4
+  (package
+    (name "rust-criterion")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "criterion" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1jsl4r0yc3fpkyjbi8aa1jrm69apqq9rxwnjnd9brqmaq44nxiz7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-anes" ,rust-anes-0.1)
+        ("rust-async-std" ,rust-async-std-1)
+        ("rust-atty" ,rust-atty-0.2)
+        ("rust-cast" ,rust-cast-0.3)
+        ("rust-ciborium" ,rust-ciborium-0.2)
+        ("rust-clap" ,rust-clap-3)
+        ("rust-criterion-plot" ,rust-criterion-plot-0.5)
+        ("rust-csv" ,rust-csv-1)
+        ("rust-futures" ,rust-futures-0.3)
+        ("rust-itertools" ,rust-itertools-0.10)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-num-traits" ,rust-num-traits-0.2)
+        ("rust-oorandom" ,rust-oorandom-11.1)
+        ("rust-plotters" ,rust-plotters-0.3)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-smol" ,rust-smol-1)
+        ("rust-tinytemplate" ,rust-tinytemplate-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-walkdir" ,rust-walkdir-2))
+       #:cargo-development-inputs
+       (("rust-approx" ,rust-approx-0.5)
+        ("rust-futures" ,rust-futures-0.3)
+        ("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://bheisler.github.io/criterion.rs/book/index.html")
+    (synopsis "Statistics-driven micro-benchmarking library")
+    (description
+     "This package provides a statistics-driven micro-benchmarking library.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-criterion-0.3
   (package
+    (inherit rust-criterion-0.4)
     (name "rust-criterion")
     (version "0.3.5")
     (source
@@ -13410,7 +13460,6 @@ (define-public rust-criterion-0.3
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "044d2x7cxfvw2g558lzyllcv7jcdkw9xmacmb0nzx8pv4pyxl10n"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-async-std" ,rust-async-std-1)
@@ -13440,12 +13489,7 @@ (define-public rust-criterion-0.3
         ("rust-futures" ,rust-futures-0.3)
         ("rust-quickcheck" ,rust-quickcheck-1)
         ("rust-rand" ,rust-rand-0.8)
-        ("rust-tempfile" ,rust-tempfile-3))))
-    (home-page "https://bheisler.github.io/criterion.rs/book/index.html")
-    (synopsis "Statistics-driven micro-benchmarking library")
-    (description
-     "This package provides a statistics-driven micro-benchmarking library.")
-    (license (list license:asl2.0 license:expat))))
+        ("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-criterion-0.2
   (package
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:00

[PATCH 12/32] gnu: Add rust-criterion-plot-0.5.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:6b4ab6c2484f75c98dd18b31c9c960789190d870.1677936691.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-criterion-plot-0.5): New variable.
(rust-criterion-plot-0.4): Inherit from above.
---
 gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

Toggle diff (67 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 08424cbdf8..00e5047cfc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -13510,10 +13510,10 @@ (define-public rust-criterion-cycles-per-byte-0.1
 criterion.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-criterion-plot-0.4
+(define-public rust-criterion-plot-0.5
   (package
     (name "rust-criterion-plot")
-    (version "0.4.4")
+    (version "0.5.0")
     (source
      (origin
        (method url-fetch)
@@ -13521,21 +13521,43 @@ (define-public rust-criterion-plot-0.4
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0mys2zkizh5az6ax77m5aqifk0vz35rn0a6wykvmjx9gkzg9c2fh"))))
+        (base32 "1c866xkjqqhzg4cjvg01f8w6xc1j3j7s58rdksl52skq89iq4l3b"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-cast" ,rust-cast-0.2)
+       (("rust-cast" ,rust-cast-0.3)
         ("rust-itertools" ,rust-itertools-0.10))
        #:cargo-development-inputs
        (("rust-itertools-num" ,rust-itertools-num-0.1)
-        ("rust-num-complex" ,rust-num-complex-0.2)
-        ("rust-rand" ,rust-rand-0.4))))
+        ("rust-num-complex" ,rust-num-complex-0.4)
+        ("rust-rand" ,rust-rand-0.8))))
     (home-page "https://github.com/bheisler/criterion.rs")
     (synopsis "Criterion's plotting library")
     (description "This package provides criterion's plotting library.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-criterion-plot-0.4
+  (package
+    (inherit rust-criterion-plot-0.5)
+    (name "rust-criterion-plot")
+    (version "0.4.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "criterion-plot" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0mys2zkizh5az6ax77m5aqifk0vz35rn0a6wykvmjx9gkzg9c2fh"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cast" ,rust-cast-0.2)
+        ("rust-itertools" ,rust-itertools-0.10))
+       #:cargo-development-inputs
+       (("rust-itertools-num" ,rust-itertools-num-0.1)
+        ("rust-num-complex" ,rust-num-complex-0.2)
+        ("rust-rand" ,rust-rand-0.4))))))
+
 (define-public rust-criterion-plot-0.3
   (package
     (inherit rust-criterion-plot-0.4)
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:00

[PATCH 14/32] gnu: rust-rand-0.8: Update to 0.8.5.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:315990393cec46423cde9a1fa1601218a0123566.1677936691.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-rand-0.8): Update to 0.8.5.

---

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

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

Toggle diff (23 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index affee8fdf1..14618cbfec 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44998,14 +44998,14 @@ (define-public rust-radix-trie-0.2
 (define-public rust-rand-0.8
   (package
     (name "rust-rand")
-    (version "0.8.4")
+    (version "0.8.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rand" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1n5wska2fbfj4dsfz8mc0pd0dgjlrb6c9anpk5mwym345rip6x9f"))))
+        (base32 "013l6931nn7gkc23jz5mm3qdhf93jjf0fg64nz2lp4i51qd8vbrl"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:00

[PATCH 17/32] gnu: Add rust-base64-0.21.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:11915102dee01598d775c717ef7fb6d1844d69bf.1677936691.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-base64-0.21): New variable.
(rust-base64-0.13): Inherit from above.
---
 gnu/packages/crates-io.scm | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

Toggle diff (63 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ce406474fc..4cbaaf0810 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5645,8 +5645,34 @@ (define-public rust-base58-0.1
 c6e7d37.  However, this package works only up to 128 bytes.")
     (license license:expat)))
 
+(define-public rust-base64-0.21
+  (package
+    (name "rust-base64")
+    (version "0.21.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "base64" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0sidjip5b33sr6w7kasfj9qxpbda41nw0x4gjjk55g55a6mdv954"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.4)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rstest" ,rust-rstest-0.12)
+        ("rust-rstest-reuse" ,rust-rstest-reuse-0.3)
+        ("rust-structopt" ,rust-structopt-0.3))))
+    (home-page "https://github.com/marshallpierce/rust-base64")
+    (synopsis "Encodes and decodes base64 as bytes or utf8")
+    (description
+     "This package encodes and decodes base64 as bytes or utf8.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-base64-0.13
   (package
+    (inherit rust-base64-0.21)
     (name "rust-base64")
     (version "0.13.0")
     (source
@@ -5657,7 +5683,6 @@ (define-public rust-base64-0.13
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1z82g23mbzjgijkpcrilc7nljpxpvpf7zxf6iyiapkgka2ngwkch"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-development-inputs
@@ -5670,12 +5695,7 @@ (define-public rust-base64-0.13
           (lambda* _
            (substitute* "Cargo.toml"
              (("0\\.3\\.2")
-              ,(package-version rust-criterion-0.3))))))))
-    (home-page "https://github.com/marshallpierce/rust-base64")
-    (synopsis "Encodes and decodes base64 as bytes or utf8")
-    (description
-     "This package encodes and decodes base64 as bytes or utf8.")
-    (license (list license:expat license:asl2.0))))
+              ,(package-version rust-criterion-0.3))))))))))
 
 (define-public rust-base64-0.12
   (package
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:01

[PATCH 18/32] gnu: rust-serde-1: Update to 1.0.139.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:999b12009bc4d51c18214ee2871afbea8d99e025.1677936691.git.arjan@adriaan.se

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

---

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

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

Toggle diff (23 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4cbaaf0810..a7285d88da 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51603,14 +51603,14 @@ (define-public rust-seq-macro-0.2
 (define-public rust-serde-1
   (package
     (name "rust-serde")
-    (version "1.0.133")
+    (version "1.0.139")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "serde" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "16lq33l09nkm0hxdhfjjmh3yjv83rrcqw9lbxb8y4q3va5km0mlp"))))
+        (base32 "1mna8q52l2qc2ipqw8jwbxplrs7d7sdqbq5f8j5scnp4i6wfnw81"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:00

[PATCH 15/32] gnu: Add rust-rstest-0.12.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:3bb344df636b0030cb70075930ec38e35fb26423.1677936691.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-rstest-0.12): New variable.
(rust-rstest-0.11): Inherit from above.
---
 gnu/packages/crates-io.scm | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

Toggle diff (48 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 14618cbfec..89716d945e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -47685,18 +47685,18 @@ (define-public rust-rstest-0.15
 and table-based tests.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-rstest-0.11
+(define-public rust-rstest-0.12
   (package
     (inherit rust-rstest-0.15)
     (name "rust-rstest")
-    (version "0.11.0")
+    (version "0.12.0")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "rstest" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "02nh4kpfg1j4v95fhc0bxx9ak3wnz5jg70f94z92wfzyx9mcd212"))))
+                "0vv11n0wiqm70lyjc1byl22sqd1z1cpaq49yxrk9myd3ar8z64nr"))))
     (arguments
      (list #:skip-build? #t
            #:cargo-inputs
@@ -47706,6 +47706,19 @@ (define-public rust-rstest-0.11
              ("rust-rustc-version" ,rust-rustc-version-0.3)
              ("rust-syn" ,rust-syn-1))))))
 
+(define-public rust-rstest-0.11
+  (package
+    (inherit rust-rstest-0.12)
+    (name "rust-rstest")
+    (version "0.11.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rstest" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02nh4kpfg1j4v95fhc0bxx9ak3wnz5jg70f94z92wfzyx9mcd212"))))))
+
 (define-public rust-rstest-0.10
   (package
     (inherit rust-rstest-0.11)
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:00

[PATCH 16/32] gnu: Add rust-rstest-reuse-0.3.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:2e601b3e76af42e1cd0b3a44e617333682a1279a.1677936691.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-rstest-reuse-0.3): New variable.

---

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

1 file changed, 13 insertions(+)

Toggle diff (26 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 89716d945e..ce406474fc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -47798,6 +47798,19 @@ (define-public rust-rstest-reuse-0.4
 scenario you want to test.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-rstest-reuse-0.3
+  (package
+    (inherit rust-rstest-reuse-0.4)
+    (name "rust-rstest-reuse")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rstest_reuse" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0k9xdqp0gw655g9l46ii0kyv64dschnf2z7vs43s6zp2phbk37dj"))))))
+
 (define-public rust-rug-1
   (package
     (name "rust-rug")
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:01

[PATCH 19/32] gnu: rust-serde-derive-1: Update to 1.0.139.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:4fea6bc30ccee949b7c9b7958e48c60e20293331.1677936691.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-serde-derive-1): Update to 1.0.139.

---

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

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

Toggle diff (23 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a7285d88da..21a7a99bda 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51958,14 +51958,14 @@ (define-public rust-serdeconv-0.4
 (define-public rust-serde-derive-1
   (package
     (name "rust-serde-derive")
-    (version "1.0.133")
+    (version "1.0.139")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "serde-derive" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0dym0l8a0pch0mkqnhrf89n4wngzwf0d1z88hb8dhs456acic87d"))))
+        (base32 "1yrxaj1jviv99z14mn59sppmbgc4szhzp3xdb2pk4yfyq4q347fw"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:06

[PATCH 20/32] gnu: Add rust-basic-toml-0.1.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:175eaafabec7fe30390467cad0b3d19daade3c82.1677936691.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-basic-toml-0.1): New variable.

---

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 21a7a99bda..6c718ceb71 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5860,6 +5860,33 @@ (define-public rust-base-x-0.2
     (description "This library provides for encoding and decoding any base.")
     (license license:expat)))
 
+(define-public rust-basic-toml-0.1
+  (package
+    (name "rust-basic-toml")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "basic-toml" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1d2h378373x0i8j4mi4sfaq8np9hf5xqr2rh9pa7r5irfxk9p09f"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-semver" ,rust-semver-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/dtolnay/basic-toml")
+    (synopsis "Minimal TOML library with few dependencies")
+    (description "This package provides minimal TOML library with few
+dependencies.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-bat-0.18
   (package
     (name "bat")
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:06

[PATCH 21/32] gnu: rust-trybuild-1: Update to 1.0.77.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:a3c05698b6c60d7cd685aa5ecfc9693ba88fb0e6.1677936691.git.arjan@adriaan.se

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

---

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

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

Toggle diff (37 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6c718ceb71..bac4f09ad7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63854,24 +63854,25 @@ (define-public rust-try-lock-0.1
 (define-public rust-trybuild-1
   (package
     (name "rust-trybuild")
-    (version "1.0.54")
+    (version "1.0.77")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "trybuild" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0gzxbal0zdjnwilsisgbm59c242gvym8dafwsl5s8b5nhvzl6hzh"))))
+        (base32 "04rlcx55q7qbc17hv4znypwnm5n5d5ynbh5vsca8wk0nyakaakd4"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-dissimilar" ,rust-dissimilar-1)
+       (("rust-basic-toml" ,rust-basic-toml-0.1)
+        ("rust-dissimilar" ,rust-dissimilar-1)
         ("rust-glob" ,rust-glob-0.3)
         ("rust-once-cell" ,rust-once-cell-1)
         ("rust-serde" ,rust-serde-1)
+        ("rust-serde-derive" ,rust-serde-derive-1)
         ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-termcolor" ,rust-termcolor-1)
-        ("rust-toml" ,rust-toml-0.5))))
+        ("rust-termcolor" ,rust-termcolor-1))))
     (home-page "https://github.com/dtolnay/trybuild")
     (synopsis "Test harness for ui tests of compiler diagnostics")
     (description
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:06

[PATCH 22/32] gnu: rust-anyhow-1: Update to 1.0.69.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:53dc8c860546250cd4e14b581be1bc271e2b15d1.1677936691.git.arjan@adriaan.se

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

---

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

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

Toggle diff (24 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bac4f09ad7..b52dc07cb9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2764,7 +2764,7 @@ (define-public rust-antidote-1
 (define-public rust-anyhow-1
   (package
     (name "rust-anyhow")
-    (version "1.0.65")
+    (version "1.0.69")
     (source
      (origin
        (method url-fetch)
@@ -2773,7 +2773,7 @@ (define-public rust-anyhow-1
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "00jnbylbji1wxvgpk6fcpcxyh4firn223w0lpdvxm1117r71l5lq"))))
+         "007q0cw3zv8y5314c41vjyqznrqvim5ydv0306wy9mn34zbznji2"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:06

[PATCH 23/32] gnu: rust-async-trait-0.1: Update to 0.1.64.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:102e54b22855feebfa691276219523e4fb0ab4d9.1677936691.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-async-trait-0.1): Update to 0.1.64.

---

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

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

Toggle diff (24 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b52dc07cb9..380eb521c3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4946,7 +4946,7 @@ (define-public rust-async-tls-0.10
 (define-public rust-async-trait-0.1
   (package
     (name "rust-async-trait")
-    (version "0.1.57")
+    (version "0.1.64")
     (source
      (origin
        (method url-fetch)
@@ -4954,7 +4954,7 @@ (define-public rust-async-trait-0.1
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0vw256zb104ni4lw0r5j3jdws54r9n01mvl8gs6pacmwp1348ikn"))))
+         "18j7v85y2df62c1ylrzvgrs0afmzvnrdhwnf50hh8g4cpblzrmqw"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:06

[PATCH 25/32] gnu: Add rust-windows-targets-0.42.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:5242aceedfe9f4e077c97641a8fab623e431ee1a.1677936691.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-windows-targets-0.42): New variable.
(rust-windows-aarch64-gnullvm-0.42): Update to 0.42.1.
(rust-windows-aarch64-msvc-0.42): Update to 0.42.1.
(rust-windows-i686-gnu-0.42): Update to 0.42.1.
(rust-windows-i686-msvc-0.42): Update to 0.42.1.
(rust-windows-x86-64-gnu-0.42): Update to 0.42.1.
(rust-windows-x86-64-gnullvm-0.42): Update to 0.42.1.
(rust-windows-x86-64-msvc-0.42): Update to 0.42.1.
---
 gnu/packages/crates-io.scm | 55 ++++++++++++++++++++++++++++----------
 1 file changed, 41 insertions(+), 14 deletions(-)

Toggle diff (159 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f17a253336..9eadd6b96b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -69218,14 +69218,14 @@ (define-public rust-windows-0.32
 (define-public rust-windows-aarch64-gnullvm-0.42
   (package
     (name "rust-windows-aarch64-gnullvm")
-    (version "0.42.0")
+    (version "0.42.1")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "windows-aarch64-gnullvm" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "17m1p753qk02r25afg31dxym4rpy7kpr0z8nwl5f1jzhyrqsmlj1"))))
+                "0256d14kqpiniwcm6y2yfj7jbzdvvj4l6i65r5zyrza36bl6964c"))))
     (build-system cargo-build-system)
     (arguments
      (list #:skip-build? #t))
@@ -69238,14 +69238,14 @@ (define-public rust-windows-aarch64-gnullvm-0.42
 (define-public rust-windows-aarch64-msvc-0.42
   (package
     (name "rust-windows-aarch64-msvc")
-    (version "0.42.0")
+    (version "0.42.1")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "windows-aarch64-msvc" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1d6d9ny0yl5l9vvagydigvkfcphzk2aygchiccywijimb8pja3yx"))))
+                "1iy6adiaz2956f0kcl2wfdjx49ayv2lp11glkxxc85pw7xkip2sc"))))
     (build-system cargo-build-system)
     (arguments
      (list #:skip-build? #t))
@@ -69297,14 +69297,14 @@ (define-public rust-windows-aarch64-msvc-0.28
 (define-public rust-windows-i686-gnu-0.42
   (package
     (name "rust-windows-i686-gnu")
-    (version "0.42.0")
+    (version "0.42.1")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "windows_i686_gnu" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1rsxdjp50nk38zfd1dxj12i2qmhpvxsm6scdq8v1d10ncygy3spv"))))
+                "0h6n8mqjfq1rk4vpr9gz8md1b8f7bqksiymivdxvlc6mi998ff6y"))))
     (build-system cargo-build-system)
     (arguments
      (list #:skip-build? #t))
@@ -69356,14 +69356,14 @@ (define-public rust-windows-i686-gnu-0.28
 (define-public rust-windows-i686-msvc-0.42
   (package
     (name "rust-windows-i686-msvc")
-    (version "0.42.0")
+    (version "0.42.1")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "windows_i686_msvc" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0ii2hrsdif2ms79dfiyfzm1n579jzj42ji3fpsxd57d3v9jjzhc4"))))
+                "01966w2707qrw183lqg62i1as614i88m5a0s6pzxdpby64i12kdz"))))
     (build-system cargo-build-system)
     (arguments
      (list #:skip-build? #t))
@@ -69546,6 +69546,33 @@ (define-public rust-windows-macros-0.9
     (description "Macros for the windows crate")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-windows-targets-0.42
+  (package
+    (name "rust-windows-targets")
+    (version "0.42.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-targets" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1rwh2d1yvfjvlfidi8p9ha4lp34lb0lynynlhk65ikdz3x4j49cf"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-windows-aarch64-gnullvm" ,rust-windows-aarch64-gnullvm-0.42)
+        ("rust-windows-aarch64-msvc" ,rust-windows-aarch64-msvc-0.42)
+        ("rust-windows-i686-gnu" ,rust-windows-i686-gnu-0.42)
+        ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.42)
+        ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.42)
+        ("rust-windows-x86-64-gnullvm" ,rust-windows-x86-64-gnullvm-0.42)
+        ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.42))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Code gen support for the windows crate")
+    (description "This package provides code gen support for the windows
+crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-tokens-0.32
   (package
     (name "rust-windows-tokens")
@@ -69569,14 +69596,14 @@ (define-public rust-windows-tokens-0.32
 (define-public rust-windows-x86-64-gnu-0.42
   (package
     (name "rust-windows-x86-64-gnu")
-    (version "0.42.0")
+    (version "0.42.1")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "windows_x86_64_gnu" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1vdh8k5a4m6pfkc5gladqznyqxgapkjm0qb8iwqvqb1nnlhinyxz"))))
+                "0icwd66wd6p9hhzds93333wy2knlqbyiynf2rfy7xqc528i0y161"))))
     (build-system cargo-build-system)
     (arguments
      (list #:skip-build? #t))
@@ -69628,14 +69655,14 @@ (define-public rust-windows-x86-64-gnu-0.28
 (define-public rust-windows-x86-64-gnullvm-0.42
   (package
     (name "rust-windows-x86-64-gnullvm")
-    (version "0.42.0")
+    (version "0.42.1")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "windows-x86-64-gnullvm" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0a10rns9b07m9snlr97iqxq42zi9ai547gb5fqlv7vihpb92bm89"))))
+                "0qq41m3zkakkmch9x4x30lgv0sy3zh4jpdpxch6jp8ns6brgv2v2"))))
     (build-system cargo-build-system)
     (arguments (list #:skip-build? #t))
     (home-page "https://github.com/microsoft/windows-rs")
@@ -69647,14 +69674,14 @@ (define-public rust-windows-x86-64-gnullvm-0.42
 (define-public rust-windows-x86-64-msvc-0.42
   (package
     (name "rust-windows-x86-64-msvc")
-    (version "0.42.0")
+    (version "0.42.1")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "windows_x86_64_msvc" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1xdnvhg8yj4fgjy0vkrahq5cbgfpcd7ak2bdv8s5lwjrazc0j07l"))))
+                "1zfgzsmc0j5p9yx25j15lb1yh45mazl4hhjdvfqqhcm16snn0xj4"))))
     (build-system cargo-build-system)
     (arguments (list #:skip-build? #t))
     (home-page "https://github.com/microsoft/windows-rs")
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:06

[PATCH 24/32] gnu: Add rust-cbc-0.1.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:a70343788956864b3a863204d2d62dc95d080525.1677936691.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-cbc-0.1): New variable.

---

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 380eb521c3..f17a253336 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -9678,6 +9678,31 @@ (define-public rust-cast-0.2
        #:cargo-development-inputs
        (("rust-quickcheck" ,rust-quickcheck-0.9))))))
 
+(define-public rust-cbc-0.1
+  (package
+    (name "rust-cbc")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cbc" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "19l9y9ccv1ffg6876hshd123f2f8v7zbkc4nkckqycxf8fajmd96"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cipher" ,rust-cipher-0.4))
+       #:cargo-development-inputs
+       (("rust-aes" ,rust-aes-0.8)
+        ("rust-cipher" ,rust-cipher-0.4)
+        ("rust-hex-literal" ,rust-hex-literal-0.3))))
+    (home-page "https://github.com/RustCrypto/block-modes")
+    (synopsis "Cipher Block Chaining (CBC) block cipher mode of operation")
+    (description "This package provides Cipher Block Chaining (CBC) block
+cipher mode of operation.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-cblas-sys-0.1
   (package
     (name "rust-cblas-sys")
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:06

[PATCH 27/32] gnu: Add rust-linux-raw-sys-0.1.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:4e3ca86d42cef0fc8fa1df7cc8fece3a3573169a.1677936691.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-linux-raw-sys-0.1): New variable.
(rust-linux-raw-sys-0.0.46): Inherit from above.
---
 gnu/packages/crates-io.scm | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

Toggle diff (47 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2de43cd8aa..e1341af400 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31224,17 +31224,17 @@ (define-public rust-linkify-0.4
 punctuation.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-linux-raw-sys-0.0.46
+(define-public rust-linux-raw-sys-0.1
   (package
     (name "rust-linux-raw-sys")
-    (version "0.0.46")
+    (version "0.1.4")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "linux-raw-sys" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0kc528mp2fp8m96csm6rmwg0ac7zbgf36k19ml4a4c9j6xn4blnl"))))
+                "1926520si5wkn4m6iz6ka97ya5q1dgr8ib3fd705fscfgixgflgh"))))
     (build-system cargo-build-system)
     (arguments
      (list #:cargo-inputs
@@ -31251,6 +31251,19 @@ (define-public rust-linux-raw-sys-0.0.46
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-linux-raw-sys-0.0.46
+  (package
+    (inherit rust-linux-raw-sys-0.1)
+    (name "rust-linux-raw-sys")
+    (version "0.0.46")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "linux-raw-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0kc528mp2fp8m96csm6rmwg0ac7zbgf36k19ml4a4c9j6xn4blnl"))))))
+
 (define-public rust-libssh2-sys-0.2
   (package
     (name "rust-libssh2-sys")
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:06

[PATCH 29/32] gnu: Add rust-io-lifetimes-1.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:c74caff7d9dbefed555f1f81ee68237310f0bff9.1677936691.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-io-lifetimes-1): New variable.
(rust-io-lifetimes-0.7): Inherit from above.
---
 gnu/packages/crates-io.scm | 41 +++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 9 deletions(-)

Toggle diff (70 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a5f957cd32..5b8023efaf 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -28284,8 +28284,39 @@ (define-public rust-inventory-impl-0.1
     ;; Either license can be chosen at the users option.
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-io-lifetimes-1
+  (package
+    (name "rust-io-lifetimes")
+    (version "1.0.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "io-lifetimes" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1cqg2zy012r0l3l772mjh45m11jm0ybw7bgqgwk8308gvnhbgghs"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-async-std" ,rust-async-std-1)
+        ("rust-fs-err" ,rust-fs-err-2)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-mio" ,rust-mio-0.8)
+        ("rust-os-pipe" ,rust-os-pipe-1)
+        ("rust-socket2" ,rust-socket2-0.4)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-windows-sys" ,rust-windows-sys-0.45))))
+    (home-page "https://github.com/sunfishcode/io-lifetimes")
+    (synopsis "Low-level I/O ownership and borrowing library")
+    (description
+     "This package provides a low-level I/O ownership and borrowing
+library.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-io-lifetimes-0.7
   (package
+    (inherit rust-io-lifetimes-1)
     (name "rust-io-lifetimes")
     (version "0.7.5")
     (source (origin
@@ -28295,7 +28326,6 @@ (define-public rust-io-lifetimes-0.7
               (sha256
                (base32
                 "0x10ak2iy4p24g7bnp1rfrq6aqddjlzkykgwjdayi7nl97wmxkjr"))))
-    (build-system cargo-build-system)
     (arguments
      (list #:cargo-inputs
            `(("rust-async-std" ,rust-async-std-1)
@@ -28305,14 +28335,7 @@ (define-public rust-io-lifetimes-0.7
              ("rust-os-pipe" ,rust-os-pipe-1)
              ("rust-socket2" ,rust-socket2-0.4)
              ("rust-tokio" ,rust-tokio-1)
-             ("rust-windows-sys" ,rust-windows-sys-0.42))))
-    (home-page "https://github.com/sunfishcode/io-lifetimes")
-    (synopsis "Low-level I/O ownership and borrowing library")
-    (description
-     "This package provides a low-level I/O ownership and borrowing
-library.")
-    (license (list license:asl2.0
-                   license:expat))))
+             ("rust-windows-sys" ,rust-windows-sys-0.42))))))
 
 (define-public rust-iovec-0.1
   (package
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:06

[PATCH 26/32] gnu: Add rust-windows-sys-0.45.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:e4cc2f06a34b7f9221202b068b6cfd748b4a8faa.1677936691.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-windows-sys-0.45): New variable.
(rust-windows-sys-0.42): Inherit from above.
---
 gnu/packages/crates-io.scm | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

Toggle diff (63 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9eadd6b96b..2de43cd8aa 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -69435,8 +69435,32 @@ (define-public rust-windows-implement-0.32
 crate.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-windows-sys-0.45
+  (package
+    (name "rust-windows-sys")
+    (version "0.45.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1l36bcqm4g89pknfp8r9rl1w4bn017q6a8qlx8viv0xjxzjkna3m"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-windows-targets" ,rust-windows-targets-0.42))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Rust for Windows")
+    (description "The windows crate lets you call any Windows API past,
+present, and future using code generated on the fly directly from the metadata
+describing the API and right into your Rust package where you can call them as
+if they were just another Rust module.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-sys-0.42
   (package
+    (inherit rust-windows-sys-0.45)
     (name "rust-windows-sys")
     (version "0.42.0")
     (source (origin
@@ -69446,7 +69470,6 @@ (define-public rust-windows-sys-0.42
               (sha256
                (base32
                 "19waf8aryvyq9pzk0gamgfwjycgzk4gnrazpfvv171cby0h1hgjs"))))
-    (build-system cargo-build-system)
     (arguments
      (list #:skip-build? #t
            #:cargo-inputs
@@ -69456,14 +69479,7 @@ (define-public rust-windows-sys-0.42
              ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.42)
              ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.42)
              ("rust-windows-x86-64-gnullvm" ,rust-windows-x86-64-gnullvm-0.42)
-             ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.42))))
-    (home-page "https://github.com/microsoft/windows-rs")
-    (synopsis "Rust for Windows")
-    (description "The windows crate lets you call any Windows API past,
-present, and future using code generated on the fly directly from the metadata
-describing the API and right into your Rust package where you can call them as
-if they were just another Rust module.")
-    (license (list license:expat license:asl2.0))))
+             ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.42))))))
 
 (define-public rust-windows-sys-0.36
   (package
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:06

[PATCH 28/32] gnu: rust-os-pipe-1: Update to 1.1.3.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:b427c9398de681855219b037d15cce43652e8665.1677936691.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-os-pipe-1): Update to 1.1.3.

---

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

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

Toggle diff (29 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e1341af400..a5f957cd32 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38513,19 +38513,19 @@ (define-public rust-ordermap-0.3
 (define-public rust-os-pipe-1
   (package
     (name "rust-os-pipe")
-    (version "1.0.1")
+    (version "1.1.3")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "os-pipe" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32 "0mczqmqrkzmln4xg5ki1gwgykf4dsii0h4p7fxf667889ysz54ic"))))
+         (base32 "04ls83i290scb8sfzdzj9b3kr9yplb5k864kg841cjzkz8hbngd5"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-libc" ,rust-libc-0.2)
-        ("rust-winapi" ,rust-winapi-0.3))))
+        ("rust-windows-sys" ,rust-windows-sys-0.45))))
     (native-inputs
      (list python-minimal-wrapper))     ; For the tests.
     (home-page "https://github.com/oconnor663/os_pipe.rs")
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:13

[PATCH 30/32] gnu: Add rust-rustix-0.36.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:2a2380517f5d4739b61c4da328d92517915e05ad.1677936692.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-rustix-0.36): New variable.
(rust-rustix-0.35): Inherit from above.
---
 gnu/packages/crates-io.scm | 55 +++++++++++++++++++++++++++++++-------
 1 file changed, 46 insertions(+), 9 deletions(-)

Toggle diff (84 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5b8023efaf..8e1e3cf22b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -49144,8 +49144,53 @@ (define-public rust-rustfix-0.4
         `(("rust-failure" ,rust-failure-0.1)
           ,@(alist-delete "rust-anyhow" cargo-inputs)))))))
 
+(define-public rust-rustix-0.36
+  (package
+    (name "rust-rustix")
+    (version "0.36.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rustix" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1g1pxwmz82gf47ar5l80ijzpbcrf5yh9a6bdfi05pmgc3zqnyp7x"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-cc" ,rust-cc-1)
+        ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+        ("rust-errno" ,rust-errno-0.2)
+        ("rust-io-lifetimes" ,rust-io-lifetimes-1)
+        ("rust-itoa" ,rust-itoa-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-linux-raw-sys" ,rust-linux-raw-sys-0.1)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
+        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
+        ("rust-windows-sys" ,rust-windows-sys-0.42))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.4)
+        ("rust-ctor" ,rust-ctor-0.1)
+        ("rust-errno" ,rust-errno-0.2)
+        ("rust-flate2" ,rust-flate2-1)
+        ("rust-io-lifetimes" ,rust-io-lifetimes-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-memoffset" ,rust-memoffset-0.7)
+        ("rust-serial-test" ,rust-serial-test-0.6)
+        ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/bytecodealliance/rustix")
+    (synopsis "Safe Rust bindings to POSIX syscalls")
+    (description
+     "This package provides safe Rust bindings to POSIX syscalls.")
+    ;; Apache 2.0, Apache 2.0 with LLVM exception, or Expat.
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-rustix-0.35
   (package
+    (inherit rust-rustix-0.36)
     (name "rust-rustix")
     (version "0.35.13")
     (source (origin
@@ -49155,7 +49200,6 @@ (define-public rust-rustix-0.35
               (sha256
                (base32
                 "1yfmkj5nwghxd3nha5ywf1cj6zqh44qwm0cavwifr1ppcmnilykj"))))
-    (build-system cargo-build-system)
     (arguments
      (list #:cargo-inputs
            `(("rust-bitflags" ,rust-bitflags-1)
@@ -49180,14 +49224,7 @@ (define-public rust-rustix-0.35
              ("rust-libc" ,rust-libc-0.2)
              ("rust-memoffset" ,rust-memoffset-0.6)
              ("rust-serial-test" ,rust-serial-test-0.6)
-             ("rust-tempfile" ,rust-tempfile-3))))
-    (home-page "https://github.com/bytecodealliance/rustix")
-    (synopsis "Safe Rust bindings to POSIX syscalls")
-    (description
-     "This package provides safe Rust bindings to POSIX syscalls.")
-    ;; Apache 2.0, Apache 2.0 with LLVM exception, or Expat.
-    (license (list license:asl2.0
-                   license:expat))))
+             ("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-rustls-0.20
   (package
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:13

[PATCH 31/32] gnu: Add rust-hermit-abi-0.3.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:1ccac2c19a3757d7c2268ee275a99473980e8c2a.1677936692.git.arjan@adriaan.se

* gnu/packages/crates-io.scm (rust-hermit-abi-0.3): New variable.
(rust-hermit-abi-0.1): Inherit from above.
---
 gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

Toggle diff (62 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8e1e3cf22b..d0ae7b90cf 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -25758,10 +25758,10 @@ (define-public rust-heck-0.3
        #:cargo-inputs
        (("rust-unicode-segmentation" ,rust-unicode-segmentation-1))))))
 
-(define-public rust-hermit-abi-0.1
+(define-public rust-hermit-abi-0.3
   (package
     (name "rust-hermit-abi")
-    (version "0.1.10")
+    (version "0.3.1")
     (source
       (origin
         (method url-fetch)
@@ -25770,13 +25770,13 @@ (define-public rust-hermit-abi-0.1
          (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "0blmmzik5cs79ivq70s9gal8ypgzj50wnl2hwsaam46gjjbz2p3j"))))
+          "11j2v3q58kmi5mhjvh6hfrb7il2yzg7gmdf5lpwnwwv6qj04im7y"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
         (("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
-         ("rust-libc" ,rust-libc-0.2)
+         ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
          ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))
     (home-page "https://github.com/hermitcore/rusty-hermit")
     (synopsis "Small interface to call functions from RustyHermit")
@@ -25785,6 +25785,26 @@ (define-public rust-hermit-abi-0.1
 It is used to build the target x86_64-unknown-hermit.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-hermit-abi-0.1
+  (package
+    (inherit rust-hermit-abi-0.3)
+    (name "rust-hermit-abi")
+    (version "0.1.20")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "hermit-abi" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ypkwpf5r7m0jqdn2wfa0070i412kn9snvi1hg52w1yfvc40k8y7"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))))
+
 (define-public rust-hex-0.4
   (package
     (name "rust-hex")
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 15:13

[PATCH 32/32] gnu: Add rust-is-terminal-0.4.

Recipients:(address . 61958@debbugs.gnu.org)(name . Arjan Adriaanse)(address . arjan@adriaan.se)

Message-ID:4abb79f384be379cca6ec0a4ed4b0fef17f7cd72.1677936692.git.arjan@adriaan.se

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

---

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

1 file changed, 28 insertions(+)

Toggle diff (41 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d0ae7b90cf..039ed12661 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -28621,6 +28621,34 @@ (define-public rust-is-executable-1
 whether or not a given path points to an executable file.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-is-terminal-0.4
+  (package
+    (name "rust-is-terminal")
+    (version "0.4.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "is-terminal" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0mqqjb9z59gdbm280yq1h46h8xk40952x58fp5lqwfj1fqjv7di1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-hermit-abi" ,rust-hermit-abi-0.3)
+        ("rust-io-lifetimes" ,rust-io-lifetimes-1)
+        ("rust-rustix" ,rust-rustix-0.36)
+        ("rust-windows-sys" ,rust-windows-sys-0.45))
+       #:cargo-development-inputs
+       (("rust-atty" ,rust-atty-0.2)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/sunfishcode/is-terminal")
+    (synopsis "Test whether a given stream is a terminal")
+    (description "This package provides testing whether a given stream is a
+terminal.")
+    (license license:expat)))
+
 (define-public rust-iso8601-0.3
   (package
     (name "rust-iso8601")
-- 
2.39.1

Arjan Adriaanse wrote on 4 Mar 2023 17:30

Re: bug#61958: Acknowledgement ([PATCH 00/32] various Rust updates and additions)

Recipients:(address . 61958@debbugs.gnu.org)(address . efraim@flashner.co.il)

Message-ID:20230304173029.17532cd5@freedom.nl

Adding the Rust team members in CC seems to have failed for some

reason, hoping they can still be notified this way.

Tyler Wolf wrote on 15 May 2023 15:45

(no subject)

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

Message-ID:24da4392-5b53-b530-1670-f0e43191508f@posteo.net

Has there any movement on these changes thus far? I would CC the 
relevant people but I am not entirely sure who that would be to apply 
these patches.

Efraim Flashner wrote on 16 May 2023 08:47

Recipients:(name . Tyler Wolf)(address . tylerwolf@posteo.net)

Message-ID:ZGMnBHI38TElweXQ@3900XT

On Mon, May 15, 2023 at 01:45:21PM +0000, Tyler Wolf wrote:

Toggle quote (3 lines)

> Has there any movement on these changes thus far? I would CC the relevant

> people but I am not entirely sure who that would be to apply these patches.

That would be me. Some of the patches are redundant with the merging of
the rust-team branch. Of the 5 remaining I applied 2 of them to the
master branch, the ones that don't cause many rebuilds, and the others I
applied to (my local) rust-team branch for the next round of rust
updates.

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