* [bug#71076] [PATCH 01/81] build-system: cargo: Accept unlabeled #:cargo-inputs.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 02/81] gnu: Add rust-iri-string-0.4 Herman Rimm via Guix-patches via
` (79 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* guix/build-system/cargo.scm (crate-closure): Match unlabeled inputs.
Change-Id: Iae421281fa08d09ddd1e5d2da2864f0093d97cd1
---
guix/build-system/cargo.scm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm
index c029cc1dda..a918e25e7a 100644
--- a/guix/build-system/cargo.scm
+++ b/guix/build-system/cargo.scm
@@ -234,7 +234,17 @@ (define (crate-closure inputs)
(if (null? propagated)
(reverse result)
(loop (reverse (concatenate propagated)) result '() #f seen)))
- (((and input (label (? package? package))) rest ...)
+ (((? package? package) rest ...)
+ (if (and (not first?) (seen? seen package))
+ (loop rest result propagated first? seen)
+ (loop rest
+ (cons (list (package-name package) package) result)
+ (cons (package-cargo-inputs package)
+ propagated)
+ first?
+ (vhash-consq package package seen))))
+ ;; Match inputs with explicit labels for backward compatibility.
+ (((and input (_ (? package? package))) rest ...)
(if (and (not first?) (seen? seen package))
(loop rest result propagated first? seen)
(loop rest
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 02/81] gnu: Add rust-iri-string-0.4.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 01/81] build-system: cargo: Accept unlabeled #:cargo-inputs Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 03/81] gnu: Add rust-tower-http-0.3 Herman Rimm via Guix-patches via
` (78 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-iri-string-0.4): Add variable.
Change-Id: I7b8a6976b09b0f6b3d754e2cc0624b1c1273ea6e
---
gnu/packages/crates-io.scm | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 54ff0fc760..6045d1b5fb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -35470,6 +35470,23 @@ (define-public rust-iri-string-0.7
Resource Identifiers} and @acronym{URIs, Uniform Resource Identifiers}.")
(license (list license:expat license:asl2.0))))
+(define-public rust-iri-string-0.4
+ (package
+ (inherit rust-iri-string-0.7)
+ (name "rust-iri-string")
+ (version "0.4.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "iri-string" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0y2z4f5y87hnff2d5lcl811hp7iv2f5qri7x3fgm48z2q4w7c3wg"))))
+ (arguments
+ (list
+ #:cargo-inputs (list rust-nom-7 rust-serde-1)
+ #:cargo-development-inputs (list rust-serde-test-1)))))
+
(define-public rust-is-ci-1
(package
(name "rust-is-ci")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 03/81] gnu: Add rust-tower-http-0.3.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 01/81] build-system: cargo: Accept unlabeled #:cargo-inputs Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 02/81] gnu: Add rust-iri-string-0.4 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 04/81] gnu: Add rust-axum-server-0.5 Herman Rimm via Guix-patches via
` (77 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-web.scm (rust-tower-http-0.3): Add variable.
Change-Id: I96416d5161c32f36460b6309d7313f989a889f5f
---
gnu/packages/crates-web.scm | 51 +++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 7903d85e12..07e0795738 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -5863,6 +5863,57 @@ (define-public rust-tower-http-0.4
("rust-uuid" ,rust-uuid-1)
("rust-zstd" ,rust-zstd-0.12))))))
+(define-public rust-tower-http-0.3
+ (package
+ (inherit rust-tower-http-0.4)
+ (name "rust-tower-http")
+ (version "0.3.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tower-http" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0n6qr26ivwqv19fih5pcjk2nvmys77m964lwkqiyil9dy15h8wzq"))))
+ (arguments
+ (list
+ #:cargo-test-flags '(list "--release"
+ ;; Not the doc tests.
+ "--lib" "--bins" "--tests")
+ #:cargo-inputs (list rust-async-compression-0.3
+ rust-base64-0.13
+ rust-bitflags-1
+ rust-bytes-1
+ rust-futures-core-0.3
+ rust-futures-util-0.3
+ rust-http-0.2
+ rust-http-body-0.4
+ rust-http-range-header-0.3
+ rust-httpdate-1
+ rust-iri-string-0.4
+ rust-mime-0.3
+ rust-mime-guess-2
+ rust-percent-encoding-2
+ rust-pin-project-lite-0.2
+ rust-tokio-1
+ rust-tokio-util-0.7
+ rust-tower-0.4
+ rust-tower-layer-0.3
+ rust-tower-service-0.3
+ rust-tracing-0.1
+ rust-uuid-1)
+ #:cargo-development-inputs (list rust-brotli-3
+ rust-bytes-1
+ rust-flate2-1
+ rust-futures-0.3
+ rust-hyper-0.14
+ rust-once-cell-1
+ rust-serde-json-1
+ rust-tokio-1
+ rust-tower-0.4
+ rust-tracing-subscriber-0.3
+ rust-uuid-1)))))
+
(define-public rust-tower-layer-0.3
(package
(name "rust-tower-layer")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 04/81] gnu: Add rust-axum-server-0.5.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (2 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 03/81] gnu: Add rust-tower-http-0.3 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 05/81] gnu: Add rust-simple-asn1-0.6 Herman Rimm via Guix-patches via
` (76 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-web.scm (rust-axum-server-0.5): Add variable.
Change-Id: Iced84696100ee3423b80e5f50d0635a39df788a6
---
gnu/packages/crates-web.scm | 38 +++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 07e0795738..f21f0c3398 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -2245,6 +2245,44 @@ (define-public rust-axum-macros-0.3
(description "Macros for @code{axum}.")
(license license:expat)))
+(define-public rust-axum-server-0.5
+ (package
+ (name "rust-axum-server")
+ (version "0.5.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "axum-server" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0qz06akddj31qvxzs2ihb9fda8ig98nz70m2pv0mq880b742hzs4"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-arc-swap-1
+ rust-bytes-1
+ rust-futures-util-0.3
+ rust-http-0.2
+ rust-http-body-0.4
+ rust-hyper-0.14
+ rust-openssl-0.10
+ rust-pin-project-lite-0.2
+ rust-rustls-0.21
+ rust-rustls-pemfile-1
+ rust-tokio-1
+ rust-tokio-openssl-0.6
+ rust-tokio-rustls-0.24
+ rust-tower-service-0.3)
+ #:cargo-development-inputs (list rust-axum-0.6 rust-hyper-0.14
+ rust-tokio-1 rust-tower-0.4
+ rust-tower-http-0.3)))
+ (home-page "https://github.com/programatik29/axum-server")
+ (synopsis "High level server designed to be used with axum framework")
+ (description
+ "This package provides a high level server designed to be used with
+the axum framework.")
+ (license license:expat)))
+
(define-public rust-chardetng-0.1
(package
(name "rust-chardetng")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 05/81] gnu: Add rust-simple-asn1-0.6.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (3 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 04/81] gnu: Add rust-axum-server-0.5 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 06/81] gnu: Add rust-jsonwebtoken-9 Herman Rimm via Guix-patches via
` (75 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-crypto.scm (rust-simple-asn1-0.6): Add variable.
(rust-simple-asn1-0.4): Inherit from rust-simple-asn1-0.6.
Change-Id: I3d233008144aee8c39cf25914746c10b7b67fd2e
---
gnu/packages/crates-crypto.scm | 33 ++++++++++++++++++++++++++-------
1 file changed, 26 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 879879d09d..39f4214905 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -6063,8 +6063,33 @@ (define-public rust-signature-derive-1
("rust-syn" ,rust-syn-1)
("rust-synstructure" ,rust-synstructure-0.12))))))
+(define-public rust-simple-asn1-0.6
+ (package
+ (name "rust-simple-asn1")
+ (version "0.6.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "simple_asn1" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "11d0l3l7lppzr1wxhvsbmjmw6s2vy3v7b8ygz500z4di9qhfbi5d"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-num-bigint-0.4 rust-num-traits-0.2
+ rust-thiserror-1 rust-time-0.3)
+ #:cargo-development-inputs (list rust-quickcheck-1 rust-rand-0.8
+ rust-time-0.3)))
+ (home-page "https://github.com/acw/simple_asn1")
+ (synopsis "simple DER/ASN.1 encoding/decoding library.")
+ (description
+ "This package provides a simple DER/ASN.1 encoding/decoding library.")
+ (license license:isc)))
+
(define-public rust-simple-asn1-0.4
(package
+ (inherit rust-simple-asn1-0.6)
(name "rust-simple-asn1")
(version "0.4.1")
(source
@@ -6074,18 +6099,12 @@ (define-public rust-simple-asn1-0.4
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0jxy9as8nj65c2n27j843g4fpb95x4fjz31w6qx63q3wwlys2b39"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-chrono" ,rust-chrono-0.4)
("rust-num-bigint" ,rust-num-bigint-0.2)
("rust-num-traits" ,rust-num-traits-0.2))
#:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-0.7)
- ("rust-rand" ,rust-rand-0.5))))
- (home-page "https://github.com/acw/simple_asn1")
- (synopsis "Simple DER/ASN.1 encoding/decoding library")
- (description
- "This package provides a simple DER/ASN.1 encoding/decoding library.")
- (license license:isc)))
+ ("rust-rand" ,rust-rand-0.5))))))
(define-public rust-sm3-0.4
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 06/81] gnu: Add rust-jsonwebtoken-9.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (4 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 05/81] gnu: Add rust-simple-asn1-0.6 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 07/81] gnu: Add rust-zigzag-0.1 Herman Rimm via Guix-patches via
` (74 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-web.scm (rust-jsonwebtoken-9): Add variable.
(rust-jsonwebtoken-7): Inherit from rust-jsonwebtoken-9.
Change-Id: Id61aacdb553447da7ba5a4484f607efcc748fbe6
---
gnu/packages/crates-web.scm | 38 +++++++++++++++++++++++++++++++------
1 file changed, 32 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index f21f0c3398..1e0e0fc54c 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -4227,8 +4227,39 @@ (define-public rust-json5-0.4
which speaks Serde.")
(license license:isc)))
+(define-public rust-jsonwebtoken-9
+ (package
+ (name "rust-jsonwebtoken")
+ (version "9.3.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "jsonwebtoken" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0gqr13c9fjd4zb2lqzhgi4xwq0rfnk8a47jzjis1w1957lci1bmr"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-base64-0.21
+ rust-js-sys-0.3
+ rust-pem-3
+ rust-ring-0.17
+ rust-serde-1
+ rust-serde-json-1
+ rust-simple-asn1-0.6)
+ #:cargo-development-inputs (list rust-criterion-0.4 rust-time-0.3
+ rust-wasm-bindgen-test-0.3)))
+ (home-page "https://github.com/Keats/jsonwebtoken")
+ (synopsis "Create and decode JWTs in a strongly typed way")
+ (description
+ "This package provides a strongly typed way to create and decode
+JWTs.")
+ (license license:expat)))
+
(define-public rust-jsonwebtoken-7
(package
+ (inherit rust-jsonwebtoken-9)
(name "rust-jsonwebtoken")
(version "7.2.0")
(source
@@ -4238,7 +4269,6 @@ (define-public rust-jsonwebtoken-7
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0ciz205wcjcn7n6i871zz5xlbzk863b0ybgiqi7li9ipwhawraxg"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-base64" ,rust-base64-0.12)
("rust-pem" ,rust-pem-0.8)
@@ -4246,11 +4276,7 @@ (define-public rust-jsonwebtoken-7
("rust-serde" ,rust-serde-1)
("rust-serde-json" ,rust-serde-json-1)
("rust-simple-asn1" ,rust-simple-asn1-0.4))
- #:cargo-development-inputs (("rust-chrono" ,rust-chrono-0.4))))
- (home-page "https://github.com/Keats/jsonwebtoken")
- (synopsis "Create and decode JWTs in a strongly typed way")
- (description "Create and decode JWTs in a strongly typed way.")
- (license license:expat)))
+ #:cargo-development-inputs (("rust-chrono" ,rust-chrono-0.4))))))
(define-public rust-mas-http-0.7
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 07/81] gnu: Add rust-zigzag-0.1.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (5 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 06/81] gnu: Add rust-jsonwebtoken-9 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 08/81] gnu: Add rust-asynchronous-codec-0.7 Herman Rimm via Guix-patches via
` (73 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-zigzag-0.1): Add variable.
Change-Id: I9f599de66ba29cfea06a71c1833df19359bb6ac8
---
gnu/packages/crates-io.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6045d1b5fb..2caee882f4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -93895,6 +93895,26 @@ (define-public rust-zeroize-derive-1
(description "This crate provides custom derive support for Zeroize.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-zigzag-0.1
+ (package
+ (name "rust-zigzag")
+ (version "0.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "zigzag" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1przksgh335b16mqf1clgi6yxnypdyw67f1hlcbcx1ldl80h9d3h"))))
+ (build-system cargo-build-system)
+ (arguments (list #:cargo-inputs (list rust-num-traits-0.2)))
+ (home-page "https://github.com/That3Percent/zigzag")
+ (synopsis "ZigZag encoding and decoding")
+ (description
+ "This package provides @code{ZigZag} encoding and decoding.")
+ (license license:expat)))
+
(define-public rust-zip-0.6
(package
(name "rust-zip")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 08/81] gnu: Add rust-asynchronous-codec-0.7.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (6 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 07/81] gnu: Add rust-zigzag-0.1 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 09/81] gnu: Add rust-unsigned-varint-0.8 Herman Rimm via Guix-patches via
` (72 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-asynchronous-codec-0.7): Add variable.
Change-Id: Ibe6ee451636f8180708edbd7684fb26d3f6d7bb8
---
gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2caee882f4..75e4104fad 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -6000,6 +6000,36 @@ (define-public rust-async-trait-0.1
methods.")
(license (list license:expat license:asl2.0))))
+(define-public rust-asynchronous-codec-0.7
+ (package
+ (name "rust-asynchronous-codec")
+ (version "0.7.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "asynchronous-codec" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0cy2aqcq7km8ggpjmfvrbckvjgf1bpxh803kb4z90zqp48h0fq58"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-bytes-1
+ rust-futures-sink-0.3
+ rust-futures-util-0.3
+ rust-memchr-2
+ rust-pin-project-lite-0.2
+ rust-serde-1
+ rust-serde-cbor-0.11
+ rust-serde-json-1)
+ #:cargo-development-inputs (list rust-futures-0.3)))
+ (home-page "https://github.com/mxinden/asynchronous-codec")
+ (synopsis "Encode and decode frame utilities using `async/await`")
+ (description
+ "This package provides utilities for encoding and decoding frames
+using `async/await`.")
+ (license license:expat)))
+
(define-public rust-atoi-2
(package
(name "rust-atoi")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 09/81] gnu: Add rust-unsigned-varint-0.8.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (7 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 08/81] gnu: Add rust-asynchronous-codec-0.7 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 10/81] gnu: Add rust-persy-1 Herman Rimm via Guix-patches via
` (71 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-unsigned-varint-0.8): Add variable.
Change-Id: I368a596c70a9f904345d0da94b95e2f1904a66ec
---
gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 75e4104fad..dfbd2cc387 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -89095,6 +89095,35 @@ (define-public rust-unsafe-unwrap-0.1
"This crate enables unchecked unwrapping on Option and Result types.")
(license (list license:expat license:asl2.0))))
+(define-public rust-unsigned-varint-0.8
+ (package
+ (name "rust-unsigned-varint")
+ (version "0.8.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "unsigned-varint" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "01lwzxp0hf5p966fjq0lyz2x4l44b52py1fbffp9clabn9cnj1pb"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-asynchronous-codec-0.7
+ rust-bytes-1
+ rust-futures-io-0.3
+ rust-futures-util-0.3
+ rust-nom-7
+ rust-tokio-util-0.7)
+ #:cargo-development-inputs (list rust-criterion-0.3
+ rust-futures-executor-0.3
+ rust-hex-0.4
+ rust-quickcheck-1)))
+ (home-page "https://github.com/paritytech/unsigned-varint")
+ (synopsis "unsigned varint encoding")
+ (description "This package provides unsigned varint encoding.")
+ (license license:expat)))
+
(define-public rust-unsize-1
(package
(name "rust-unsize")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 10/81] gnu: Add rust-persy-1.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (8 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 09/81] gnu: Add rust-unsigned-varint-0.8 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 11/81] gnu: Add rust-const-str-proc-macro-0.5 Herman Rimm via Guix-patches via
` (70 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-persy-1): Add variable.
Change-Id: Ifd932fd316cf7f20d0be0732bc1f951e9c7b4708
---
gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index dfbd2cc387..3e4e3b5449 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54376,6 +54376,39 @@ (define-public rust-permutohedron-0.2
(license (list license:asl2.0
license:expat))))
+(define-public rust-persy-1
+ (package
+ (name "rust-persy")
+ (version "1.5.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "persy" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "00kddxyhlbsfnv5yg3w6x80yy8ww8qrjcjr81vnhvadk18jvgx4y"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-backtrace-0.3
+ rust-crc-3
+ rust-data-encoding-2
+ rust-fs2-0.4
+ rust-linked-hash-map-0.5
+ rust-rand-0.8
+ rust-thiserror-1
+ rust-unsigned-varint-0.8
+ rust-zigzag-0.1)
+ #:cargo-development-inputs (list rust-serde-1
+ rust-serde-derive-1
+ rust-serde-json-1
+ rust-tempfile-3)))
+ (home-page "https://persy.rs")
+ (synopsis "Transactional Persistence Engine")
+ (description
+ "This package provides persy, a Transactional Persistence Engine.")
+ (license license:mpl2.0)))
+
(define-public rust-pest-2
(package
(name "rust-pest")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 11/81] gnu: Add rust-const-str-proc-macro-0.5.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (9 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 10/81] gnu: Add rust-persy-1 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 12/81] gnu: Add rust-const-str-0.5 Herman Rimm via Guix-patches via
` (69 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-const-str-proc-macro-0.5): Add
variable.
Change-Id: I9a1dd129fa532105eb4c544600647c22c55d8ba3
---
gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3e4e3b5449..7cc43f2cfb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -15710,6 +15710,33 @@ (define-public rust-const-sha1-0.2
"This package provides a sha1 implementation for use in const contexts.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-const-str-proc-macro-0.5
+ (package
+ (name "rust-const-str-proc-macro")
+ (version "0.5.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "const-str-proc-macro" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1gw4kzrrgrsgggi765xkq0svqdjw6rqp97nyyvp3a96dghbhfc1x"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-heck-0.4
+ rust-http-1
+ rust-proc-macro2-1
+ rust-quote-1
+ rust-regex-1
+ rust-syn-2)))
+ (home-page "https://github.com/Nugine/const-str")
+ (synopsis "Macros for compile-time string operations")
+ (description
+ "This package provides macros for compile-time string operations.")
+ (license license:expat)))
+
(define-public rust-constant-time-eq-0.3
(package
(name "rust-constant-time-eq")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 12/81] gnu: Add rust-const-str-0.5.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (10 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 11/81] gnu: Add rust-const-str-proc-macro-0.5 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 13/81] gnu: Add rust-rust-librocksdb-sys-0.20 Herman Rimm via Guix-patches via
` (68 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-const-str-0.5): Add variable.
Change-Id: Ia932263acb316bffefc6120393262cc9569e4f64
---
gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7cc43f2cfb..66edd18b7d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -15710,6 +15710,30 @@ (define-public rust-const-sha1-0.2
"This package provides a sha1 implementation for use in const contexts.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-const-str-0.5
+ (package
+ (name "rust-const-str")
+ (version "0.5.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "const-str" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1agvan36a2fgks5w47kk8idym54rdk504p6q2nj8gf9v136cq61n"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-const-str-proc-macro-0.5)
+ #:cargo-development-inputs (list rust-heck-0.4
+ rust-http-1
+ rust-regex-1)))
+ (home-page "https://github.com/Nugine/const-str")
+ (synopsis "Compile-time string operations")
+ (description
+ "This package provides compile-time string operations.")
+ (license license:expat)))
+
(define-public rust-const-str-proc-macro-0.5
(package
(name "rust-const-str-proc-macro")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 13/81] gnu: Add rust-rust-librocksdb-sys-0.20.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (11 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 12/81] gnu: Add rust-const-str-0.5 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 14/81] gnu: Add rust-rust-rocksdb-0.24 Herman Rimm via Guix-patches via
` (67 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-rust-librocksdb-sys-0.20): Add
variable.
Change-Id: If4e5471a5d3b20fa5f1ae7cba07489acbbd08120
---
gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 66edd18b7d..aa02c15a6f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -67581,6 +67581,42 @@ (define-public rust-rust-ini-0.13
(base32 "1hifnbgaz01zja5995chy6vjacbif2m76nlxsisw7y1pxx4c2liy"))))
(arguments `(#:skip-build? #t))))
+(define-public rust-rust-librocksdb-sys-0.20
+ (package
+ (name "rust-rust-librocksdb-sys")
+ (version "0.20.0+9.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "rust-librocksdb-sys" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "037fp8s5208v1k25rz7j5s05swv37ss4ar5j9c3lqmyq9144zca8"))
+ (modules '((guix build utils)))
+ (snippet '(substitute* "Cargo.toml"
+ ;; Do not use static libraries.
+ (("\"static\"")
+ "\"zlib\",\n\"bzip2\"")))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-bindgen-0.69
+ rust-bzip2-sys-0.1
+ rust-cc-1
+ rust-glob-0.3
+ rust-libc-0.2
+ rust-libz-sys-1
+ rust-lz4-sys-1
+ rust-pkg-config-0.3
+ rust-tikv-jemalloc-sys-0.5
+ rust-zstd-sys-2)
+ #:cargo-development-inputs (list rust-const-str-0.5 rust-uuid-1)))
+ (native-inputs (list clang pkg-config))
+ (home-page "https://github.com/zaidoon1/rust-rocksdb")
+ (synopsis "Native bindings to librocksdb")
+ (description "This package provides native bindings to librocksdb.")
+ (license (list license:expat license:asl2.0 license:bsd-3))))
+
(define-public rust-rustbox-0.11
(package
(name "rust-rustbox")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 14/81] gnu: Add rust-rust-rocksdb-0.24.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (12 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 13/81] gnu: Add rust-rust-librocksdb-sys-0.20 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 15/81] gnu: Add rust-tikv-jemalloc-sys-0.5 Herman Rimm via Guix-patches via
` (66 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-rust-rocksdb-0.24): Add variable.
Change-Id: I58a7a6364d35faa54cd73ef3181970e6edf03839
---
gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index aa02c15a6f..7076dff8f2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -67617,6 +67617,38 @@ (define-public rust-rust-librocksdb-sys-0.20
(description "This package provides native bindings to librocksdb.")
(license (list license:expat license:asl2.0 license:bsd-3))))
+(define-public rust-rust-rocksdb-0.24
+ (package
+ (name "rust-rust-rocksdb")
+ (version "0.24.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "rust-rocksdb" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1098330423im42m3m9kx1l1yplrv6j8zg49i4y703l6kn4wawvnk"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-libc-0.2
+ rust-rust-librocksdb-sys-0.20
+ rust-serde-1)
+ #:cargo-development-inputs (list rust-bincode-1
+ rust-pretty-assertions-1
+ rust-serde-1
+ rust-tempfile-3
+ rust-trybuild-1)))
+ (native-inputs (list clang pkg-config))
+ (inputs (list (list zstd "lib")))
+ (home-page "https://github.com/zaidoon1/rust-rocksdb")
+ (synopsis "Rust wrapper for Facebook's RocksDB embeddable database")
+ (description
+ "This package provides a Rust wrapper for Facebook's @code{RocksDB}
+embeddable database.")
+ (license license:asl2.0)))
+
(define-public rust-rustbox-0.11
(package
(name "rust-rustbox")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 15/81] gnu: Add rust-tikv-jemalloc-sys-0.5.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (13 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 14/81] gnu: Add rust-rust-rocksdb-0.24 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 16/81] gnu: Add rust-tikv-jemallocator-0.5 Herman Rimm via Guix-patches via
` (65 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (override-jemalloc,
rust-tikv-jemalloc-sys-0.5): Add variables.
(rust-tikv-jemalloc-sys-0.4): Inherit from rust-tikv-jemalloc-sys-0.5.
Change-Id: Ic37cea079d42883b91e8cfd5382fd9d95d658851
---
gnu/packages/crates-io.scm | 49 +++++++++++++++++++++++++++++++-------
1 file changed, 41 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7076dff8f2..8aee499902 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -128,7 +128,8 @@ (define-module (gnu packages crates-io)
#:use-module (gnu packages xorg)
#:use-module (gnu packages gtk)
#:use-module (gnu packages webkit)
- #:use-module (srfi srfi-1))
+ #:use-module (srfi srfi-1)
+ #:export (override-jemalloc))
;;;
;;; Please: Try to add new module packages in alphabetic order.
@@ -82683,6 +82684,18 @@ (define-public rust-thrift-0.13
("rust-ordered-float" ,rust-ordered-float-1)
("rust-threadpool" ,rust-threadpool-1))))))
+(define override-jemalloc
+#~(modify-phases %standard-phases
+ (add-after 'configure 'override-jemalloc
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; This flag is needed when not using the bundled jemalloc.
+ ;; https://github.com/tikv/jemallocator/issues/19
+ (setenv "CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS"
+ "1")
+ (setenv "JEMALLOC_OVERRIDE"
+ (string-append (assoc-ref inputs "jemalloc")
+ "/lib/libjemalloc_pic.a"))))))
+
(define-public rust-tikv-jemalloc-ctl-0.4
(package
(name "rust-tikv-jemalloc-ctl")
@@ -82716,8 +82729,34 @@ (define-public rust-tikv-jemalloc-ctl-0.4
introspection APIs.")
(license (list license:expat license:asl2.0))))
+(define-public rust-tikv-jemalloc-sys-0.5
+ (package
+ (name "rust-tikv-jemalloc-sys")
+ (version "0.5.4+5.3.0-patched")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tikv-jemalloc-sys" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1lc5vm1p9dqdvd3mn3264zddnd7z6i95ch3y69prnjgxp0y480ll"))
+ (modules '((guix build utils)))
+ (snippet '(delete-file-recursively "jemalloc"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-cc-1 rust-libc-0.2)
+ #:phases override-jemalloc))
+ (native-inputs (list jemalloc))
+ (home-page "https://github.com/tikv/jemallocator")
+ (synopsis "Rust FFI bindings to jemalloc")
+ (description "This package provides Rust FFI bindings to jemalloc.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-tikv-jemalloc-sys-0.4
(package
+ (inherit rust-tikv-jemalloc-sys-0.5)
(name "rust-tikv-jemalloc-sys")
(version "0.4.1+5.2.1-patched")
(source
@@ -82732,18 +82771,12 @@ (define-public rust-tikv-jemalloc-sys-0.4
(modules '((guix build utils)))
(snippet
'(begin (delete-file-recursively "jemalloc")))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-cc" ,rust-cc-1)
("rust-fs-extra" ,rust-fs-extra-1)
- ("rust-libc" ,rust-libc-0.2))))
- (home-page
- "https://github.com/tikv/jemallocator")
- (synopsis "Rust FFI bindings to jemalloc")
- (description "This package provides a Rust FFI bindings to jemalloc.")
- (license (list license:expat license:asl2.0))))
+ ("rust-libc" ,rust-libc-0.2))))))
(define-public rust-tikv-jemallocator-0.4
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 16/81] gnu: Add rust-tikv-jemallocator-0.5.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (14 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 15/81] gnu: Add rust-tikv-jemalloc-sys-0.5 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 17/81] gnu: Add rust-tikv-jemalloc-ctl-0.5 Herman Rimm via Guix-patches via
` (64 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-tikv-jemallocator-0.5): Add
variables.
(rust-tikv-jemallocator-0.4): Inherit from rust-tikv-jemallocator-0.5.
Change-Id: I7c280bbacbffb5aee78dc41d9fc082387992040d
---
gnu/packages/crates-io.scm | 40 +++++++++++++++++++++++++++++---------
1 file changed, 31 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8aee499902..16583e582a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -82778,8 +82778,38 @@ (define-public rust-tikv-jemalloc-sys-0.4
("rust-fs-extra" ,rust-fs-extra-1)
("rust-libc" ,rust-libc-0.2))))))
+(define-public rust-tikv-jemallocator-0.5
+ (package
+ (name "rust-tikv-jemallocator")
+ (version "0.5.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tikv-jemallocator" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1jpanfm9az8hcbg6dyxdabykx03lj0j4g9cbwfa6rig5dg1f0pwn"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-test-flags
+ '(list "--release" "--"
+ "--skip=background_threads_enabled")
+ #:cargo-inputs (list rust-libc-0.2 rust-tikv-jemalloc-sys-0.5)
+ #:cargo-development-inputs (list rust-paste-1
+ rust-tikv-jemalloc-ctl-0.5)
+ #:phases override-jemalloc))
+ (native-inputs (list jemalloc))
+ (home-page "https://github.com/tikv/jemallocator")
+ (synopsis "Rust allocator backed by jemalloc")
+ (description
+ "This package provides a Rust allocator backed by jemalloc.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-tikv-jemallocator-0.4
(package
+ (inherit rust-tikv-jemallocator-0.5)
(name "rust-tikv-jemallocator")
(version "0.4.1")
(source
@@ -82791,20 +82821,12 @@ (define-public rust-tikv-jemallocator-0.4
(sha256
(base32
"1pyc94yx74s3vxnr22gnpj0b2f87s0vql0c5ayy1b1zb0jkaa51w"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-libc" ,rust-libc-0.2)
("rust-tikv-jemalloc-sys"
- ,rust-tikv-jemalloc-sys-0.4))))
- (home-page
- "https://github.com/tikv/jemallocator")
- (synopsis
- "Rust allocator backed by jemalloc")
- (description
- "This package provides a Rust allocator backed by jemalloc.")
- (license (list license:expat license:asl2.0))))
+ ,rust-tikv-jemalloc-sys-0.4))))))
(define-public rust-time-0.3
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 17/81] gnu: Add rust-tikv-jemalloc-ctl-0.5.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (15 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 16/81] gnu: Add rust-tikv-jemallocator-0.5 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 18/81] gnu: Add rust-tracing-flame-0.2 Herman Rimm via Guix-patches via
` (63 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-tikv-jemalloc-ctl-0.5): Add variable.
(rust-tikv-jemalloc-ctl-0.4): Inherit from rust-tikv-jemalloc-ctl-0.5.
Change-Id: I92818cbff791d2d884e22f6dc3629438ae1c9bd5
---
gnu/packages/crates-io.scm | 39 ++++++++++++++++++++++++++++----------
1 file changed, 29 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 16583e582a..bb67d59ca1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -82696,8 +82696,36 @@ (define override-jemalloc
(string-append (assoc-ref inputs "jemalloc")
"/lib/libjemalloc_pic.a"))))))
+(define-public rust-tikv-jemalloc-ctl-0.5
+ (package
+ (name "rust-tikv-jemalloc-ctl")
+ (version "0.5.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tikv-jemalloc-ctl" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0763cba891c9r8r8d8iqw5pfcq409w6l7fbnyzvm8yw0gp9gx6v1"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-libc-0.2
+ rust-paste-1
+ rust-tikv-jemalloc-sys-0.5)
+ #:cargo-development-inputs (list rust-tikv-jemallocator-0.5)
+ #:phases override-jemalloc))
+ (native-inputs (list jemalloc))
+ (home-page "https://github.com/tikv/jemallocator")
+ (synopsis "Wrapper for jemalloc control and introspection APIs")
+ (description
+ "This package provides a safe wrapper over jemalloc's control and
+introspection APIs.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-tikv-jemalloc-ctl-0.4
(package
+ (inherit rust-tikv-jemalloc-ctl-0.5)
(name "rust-tikv-jemalloc-ctl")
(version "0.4.1")
(source
@@ -82709,7 +82737,6 @@ (define-public rust-tikv-jemalloc-ctl-0.4
(sha256
(base32
"1pqs08dgnnrgbib8syldxmm8cjgyz80scs9i8jgn6mw86gj8137j"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
@@ -82719,15 +82746,7 @@ (define-public rust-tikv-jemalloc-ctl-0.4
,rust-tikv-jemalloc-sys-0.4))
#:cargo-development-inputs
(("rust-tikv-jemallocator"
- ,rust-tikv-jemallocator-0.4))))
- (home-page
- "https://github.com/tikv/jemallocator")
- (synopsis
- "Safe wrapper over jemalloc's control and introspection APIs")
- (description
- "This package provides a safe wrapper over jemalloc's control and
-introspection APIs.")
- (license (list license:expat license:asl2.0))))
+ ,rust-tikv-jemallocator-0.4))))))
(define-public rust-tikv-jemalloc-sys-0.5
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 18/81] gnu: Add rust-tracing-flame-0.2.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (16 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 17/81] gnu: Add rust-tikv-jemalloc-ctl-0.5 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 19/81] gnu: Add rust-opentelemetry-api-0.18 Herman Rimm via Guix-patches via
` (62 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-tracing-flame-0.2): Add variable.
Change-Id: I903970fe64088fd903109cbd83f841583bc97bee
---
gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bb67d59ca1..7d1d375d61 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -86155,6 +86155,30 @@ (define-public rust-tracing-error-0.2
(description "Utilities for enriching errors with `tracing`.")
(license license:expat)))
+(define-public rust-tracing-flame-0.2
+ (package
+ (name "rust-tracing-flame")
+ (version "0.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tracing-flame" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1ad34bhy9gsj0ijn56jsvizydash6zcybbls29g1i2a7w5z13bhb"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-lazy-static-1 rust-tracing-0.1
+ rust-tracing-subscriber-0.3)
+ #:cargo-development-inputs (list rust-tempfile-3)))
+ (home-page "https://tokio.rs")
+ (synopsis "Tracing layer to create flamegraphs from span timings")
+ (description
+ "This package provides a @code{tracing} layer for creating
+flamegraphs from span timings.")
+ (license license:expat)))
+
(define-public rust-tracing-futures-0.2
(package
(name "rust-tracing-futures")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 19/81] gnu: Add rust-opentelemetry-api-0.18.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (17 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 18/81] gnu: Add rust-tracing-flame-0.2 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 20/81] gnu: Add rust-opentelemetry-http-0.7 Herman Rimm via Guix-patches via
` (61 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-opentelemetry-api-0.18): Add
variable.
Change-Id: I983871247aebb94b49e6381c2e9450c5594bbe39
---
gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7d1d375d61..d0240ef937 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -50905,6 +50905,37 @@ (define-public rust-opentelemetry-0.21
framework.")
(license license:asl2.0)))
+(define-public rust-opentelemetry-api-0.18
+ (package
+ (name "rust-opentelemetry-api")
+ (version "0.18.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "opentelemetry_api" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "08hcfvvjnqgw2i86pks6rhmxnac9jyafx543g8y83k3s3vi9cky2"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-fnv-1
+ rust-futures-channel-0.3
+ rust-futures-util-0.3
+ rust-indexmap-1
+ rust-js-sys-0.3
+ rust-once-cell-1
+ rust-pin-project-lite-0.2
+ rust-thiserror-1
+ rust-tokio-stream-0.1)))
+ (home-page "https://github.com/open-telemetry/opentelemetry-rust")
+ (synopsis "OpenTelemetry APIs")
+ (description
+ "This package provides APIs for @code{OpenTelemetry}, a metrics
+collection and distributed tracing framework.")
+ (license license:asl2.0)))
+
(define-public rust-opentelemetry-jaeger-0.20
(package
(name "rust-opentelemetry-jaeger")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 20/81] gnu: Add rust-opentelemetry-http-0.7.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (18 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 19/81] gnu: Add rust-opentelemetry-api-0.18 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 21/81] gnu: Add rust-opentelemetry-sdk-0.18 Herman Rimm via Guix-patches via
` (60 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-web.scm (rust-opentelemetry-http-0.7): Add
variable.
(rust-opentelemetry-http-0.10)[description]: List some use cases.
Change-Id: I19b0f95e841a6c25ec6119c5996c65c5d52573c8
---
gnu/packages/crates-web.scm | 31 +++++++++++++++++++++++++++++--
1 file changed, 29 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 1e0e0fc54c..6629bc9327 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -4532,10 +4532,37 @@ (define-public rust-opentelemetry-http-0.10
(home-page "https://github.com/open-telemetry/opentelemetry-rust")
(synopsis "Helpers for exchange of traces and metrics over HTTP")
(description
- "This package provides helper implementations for exchange of traces
-and metrics over HTTP.")
+ "This package provides helper implementations for exchange of
+traces and metrics over HTTP. Uses include: propagating and extracting
+context over http, exporting telemetry, and requesting sampling
+strategies.")
(license license:asl2.0)))
+(define-public rust-opentelemetry-http-0.7
+ (package
+ (inherit rust-opentelemetry-http-0.10)
+ (name "rust-opentelemetry-http")
+ (version "0.7.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "opentelemetry-http" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0pc20cbs7xxqylr750303i1fd4x55icl4i8srqz1hr33sjnpkp0y"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list #:cargo-inputs (list rust-async-trait-0.1
+ rust-bytes-1
+ rust-http-0.2
+ rust-hyper-0.14
+ rust-isahc-1
+ rust-opentelemetry-api-0.18
+ rust-reqwest-0.11
+ rust-surf-2
+ rust-tokio-1)))))
+
(define-public rust-poem-1
(package
(name "rust-poem")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 21/81] gnu: Add rust-opentelemetry-sdk-0.18.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (19 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 20/81] gnu: Add rust-opentelemetry-http-0.7 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 22/81] gnu: Add rust-opentelemetry-0.18 Herman Rimm via Guix-patches via
` (59 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-opentelemetry-sdk-0.18): Add
variable.
Change-Id: Ib5c838856dcc980bba432ea82d8aac83ef80343f
---
gnu/packages/crates-io.scm | 45 ++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d0240ef937..4c1ec789ce 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51076,6 +51076,51 @@ (define-public rust-opentelemetry-proto-0.4
transformations.")
(license license:asl2.0)))
+(define-public rust-opentelemetry-sdk-0.18
+ (package
+ (name "rust-opentelemetry-sdk")
+ (version "0.18.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "opentelemetry_sdk" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "04wiq0jsdxr8r1760hq5r57az68ljcbby57jlb1626rp6d4ir90w"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:tests? #f ; Requires additional features/dependencies.
+ #:cargo-inputs (list rust-async-std-1
+ rust-async-trait-0.1
+ rust-crossbeam-channel-0.5
+ rust-dashmap-5
+ rust-fnv-1
+ rust-futures-channel-0.3
+ rust-futures-executor-0.3
+ rust-futures-util-0.3
+ rust-http-0.2
+ rust-once-cell-1
+ rust-opentelemetry-http-0.7
+ rust-opentelemetry-api-0.18
+ rust-percent-encoding-2
+ rust-rand-0.8
+ rust-serde-1
+ rust-serde-json-1
+ rust-thiserror-1
+ rust-tokio-1
+ rust-tokio-stream-0.1
+ rust-url-2)
+ #:cargo-development-inputs (list rust-bincode-1
+ rust-criterion-0.3
+ rust-rand-distr-0.4)))
+ (home-page "https://github.com/open-telemetry/opentelemetry-rust")
+ (synopsis "SDK for OpenTelemetry")
+ (description
+ "This package provides the SDK for @code{OpenTelemetry}, a metrics
+collection and distributed tracing framework.")
+ (license license:asl2.0)))
+
(define-public rust-opentelemetry-sdk-0.21
(package
(name "rust-opentelemetry-sdk")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 22/81] gnu: Add rust-opentelemetry-0.18.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (20 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 21/81] gnu: Add rust-opentelemetry-sdk-0.18 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 23/81] gnu: Add rust-opentelemetry-semantic-conventions-0.10 Herman Rimm via Guix-patches via
` (58 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-opentelemetry-0.18): Add variable.
Change-Id: Iea47733a94b82df917652e525a83319f937294a0
---
gnu/packages/crates-io.scm | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4c1ec789ce..a932725f11 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -50905,6 +50905,23 @@ (define-public rust-opentelemetry-0.21
framework.")
(license license:asl2.0)))
+(define-public rust-opentelemetry-0.18
+ (package
+ (inherit rust-opentelemetry-0.21)
+ (name "rust-opentelemetry")
+ (version "0.18.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "opentelemetry" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0vh8xzzigx1n95pv3vxd09lxan40626hwjry6q56q44a53bw7mk9"))))
+ (arguments
+ (list #:cargo-inputs (list rust-opentelemetry-api-0.18
+ rust-opentelemetry-sdk-0.18)))))
+
(define-public rust-opentelemetry-api-0.18
(package
(name "rust-opentelemetry-api")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 23/81] gnu: Add rust-opentelemetry-semantic-conventions-0.10.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (21 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 22/81] gnu: Add rust-opentelemetry-0.18 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 24/81] gnu: Add rust-prost-types-0.9 Herman Rimm via Guix-patches via
` (57 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm
(rust-opentelemetry-semantic-conventions-0.10): Add variable.
Change-Id: Ic49ce095a8d47543d15bd59e3f46adadf9147d77
---
gnu/packages/crates-io.scm | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a932725f11..f92f9641f4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51212,6 +51212,21 @@ (define-public rust-opentelemetry-semantic-conventions-0.13
@code{OpenTelemetry}.")
(license license:asl2.0)))
+(define-public rust-opentelemetry-semantic-conventions-0.10
+ (package
+ (inherit rust-opentelemetry-semantic-conventions-0.13)
+ (name "rust-opentelemetry-semantic-conventions")
+ (version "0.10.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "opentelemetry-semantic-conventions" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1swyxkrhm3n1r8639092fxiyl0r9l27vmqhqdmivc2mv18iy00lv"))))
+ (arguments (list #:cargo-inputs (list rust-opentelemetry-0.18)))))
+
(define-public rust-opentelemetry-stdout-0.2
(package
(name "rust-opentelemetry-stdout")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 24/81] gnu: Add rust-prost-types-0.9.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (22 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 23/81] gnu: Add rust-opentelemetry-semantic-conventions-0.10 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 25/81] gnu: Add rust-thrift-0.16 Herman Rimm via Guix-patches via
` (56 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-prost-types-0.9): Add variable.
Change-Id: I5a0d1960c0231a86ebe4a178356610a041fbcd91
---
gnu/packages/crates-io.scm | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f92f9641f4..a960d8682f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -59728,6 +59728,23 @@ (define-public rust-prost-types-0.10
("rust-prost" ,rust-prost-0.10))
#:cargo-development-inputs (("rust-proptest" ,rust-proptest-1))))))
+(define-public rust-prost-types-0.9
+ (package
+ (inherit rust-prost-types-0.10)
+ (name "rust-prost-types")
+ (version "0.9.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "prost-types" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "02pgz98nn62bb8glspb9m4fn3rrr5sc0y1wk4qnlhg3fhc77ljsk"))))
+ (arguments
+ (list #:cargo-inputs (list rust-bytes-1 rust-prost-0.9)
+ #:cargo-development-inputs (list rust-proptest-1)))))
+
;; It's recommended that rust-protobuf, rust-protobuf-codegen
;; and rust-probuf-codegen-pure be the same version
(define-public rust-protobuf-2
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 25/81] gnu: Add rust-thrift-0.16.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (23 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 24/81] gnu: Add rust-prost-types-0.9 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 26/81] gnu: Add rust-opentelemetry-jaeger-0.17 Herman Rimm via Guix-patches via
` (55 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-thrift-0.16): Add variable.
Change-Id: If0800111e7208d24bfddf36fb29f332015b943a2
---
gnu/packages/crates-io.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a960d8682f..bdd1fd2983 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -82788,6 +82788,26 @@ (define-public rust-thrift-0.17
system.")
(license license:asl2.0)))
+(define-public rust-thrift-0.16
+ (package
+ (inherit rust-thrift-0.17)
+ (name "rust-thrift")
+ (version "0.16.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "thrift" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1w0gb6qf5hrz10nwdfpw2vnjb666549szhmp30pdgvmlvd68qrq9"))))
+ (arguments
+ (list #:cargo-inputs (list rust-byteorder-1
+ rust-integer-encoding-3
+ rust-log-0.4
+ rust-ordered-float-1
+ rust-threadpool-1)))))
+
(define-public rust-thrift-0.13
(package
(inherit rust-thrift-0.17)
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 26/81] gnu: Add rust-opentelemetry-jaeger-0.17.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (24 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 25/81] gnu: Add rust-thrift-0.16 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 27/81] gnu: Add rust-tracing-opentelemtry-0.18 Herman Rimm via Guix-patches via
` (54 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-opentelemetry-jaeger-0.17): Add
variable.
Change-Id: Id2bb5e0eef204823064cc85fe82b203e59ac7a91
---
gnu/packages/crates-io.scm | 50 ++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bdd1fd2983..29529963f6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51009,6 +51009,56 @@ (define-public rust-opentelemetry-jaeger-0.20
@code{OpenTelemetry}.")
(license license:asl2.0)))
+(define-public rust-opentelemetry-jaeger-0.17
+ (package
+ (inherit rust-opentelemetry-jaeger-0.20)
+ (name "rust-opentelemetry-jaeger")
+ (version "0.17.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "opentelemetry-jaeger" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0yigfk77znmdammxdq6r15pb51pcynsc6k8yjdw8ax3874kmsy0y"))))
+ (arguments
+ (list
+ ;; error[E0433]: failed to resolve:
+ ;; could not find `testing` in `opentelemetry`
+ #:tests? #f
+ #:cargo-inputs (list rust-async-std-1
+ rust-async-trait-0.1
+ rust-base64-0.13
+ rust-futures-0.3
+ rust-futures-executor-0.3
+ rust-futures-util-0.3
+ rust-headers-0.3
+ rust-http-0.2
+ rust-hyper-0.14
+ rust-hyper-tls-0.5
+ rust-isahc-1
+ rust-js-sys-0.3
+ rust-once-cell-1
+ rust-opentelemetry-0.18
+ rust-opentelemetry-http-0.7
+ rust-opentelemetry-semantic-conventions-0.10
+ rust-pin-project-lite-0.2
+ rust-prost-0.9
+ rust-prost-types-0.9
+ rust-reqwest-0.11
+ rust-surf-2
+ rust-thiserror-1
+ rust-thrift-0.16
+ rust-tokio-1
+ rust-tonic-0.6
+ rust-wasm-bindgen-0.2
+ rust-wasm-bindgen-futures-0.4
+ rust-web-sys-0.3)
+ #:cargo-development-inputs (list rust-bytes-1
+ rust-futures-executor-0.3
+ rust-tokio-1)))))
+
(define-public rust-opentelemetry-otlp-0.14
(package
(name "rust-opentelemetry-otlp")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 27/81] gnu: Add rust-tracing-opentelemtry-0.18.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (25 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 26/81] gnu: Add rust-opentelemetry-jaeger-0.17 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 28/81] gnu: Add rust-rust-argon2-1 Herman Rimm via Guix-patches via
` (53 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-tracing-opentelemtry-0.18): Add
variable.
Change-Id: I49ceb91a8696618138d197817f8dda273ba79c3b
---
gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 29529963f6..f170b04efb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -86516,6 +86516,36 @@ (define-public rust-tracing-opentelemetry-0.22
"This package provides @code{OpenTelemetry} integration for tracing.")
(license license:expat)))
+(define-public rust-tracing-opentelemetry-0.18
+ (package
+ (inherit rust-tracing-opentelemetry-0.22)
+ (name "rust-tracing-opentelemetry")
+ (version "0.18.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tracing-opentelemetry" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1pj8mnxkpp4jwkb45jipavdhpdrsa4h901nz689jf4zajmxbisr1"))))
+ (arguments
+ (list
+ #:cargo-inputs (list rust-async-trait-0.1
+ rust-once-cell-1
+ rust-opentelemetry-0.18
+ rust-thiserror-1
+ rust-tracing-0.1
+ rust-tracing-core-0.1
+ rust-tracing-log-0.1
+ rust-tracing-subscriber-0.3)
+ #:cargo-development-inputs (list rust-async-trait-0.1
+ rust-criterion-0.3
+ rust-futures-util-0.3
+ rust-opentelemetry-jaeger-0.17
+ rust-tokio-1
+ rust-tokio-stream-0.1)))))
+
(define-public rust-tracing-serde-0.1
(package
(name "rust-tracing-serde")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 28/81] gnu: Add rust-rust-argon2-1.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (26 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 27/81] gnu: Add rust-tracing-opentelemtry-0.18 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 29/81] gnu: Add rust-ruma-0.9-1.5495b85 Herman Rimm via Guix-patches via
` (52 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-crypto.scm (rust-rust-argon2-1): Add variable.
(rust-rust-argon2-0.8): Inherit from rust-rust-argon2-1.
Change-Id: I28f506cec246eed17da301aa74bf786ec77cb49a
---
gnu/packages/crates-crypto.scm | 38 +++++++++++++++++++++++++++-------
1 file changed, 30 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 39f4214905..f2ad7b73f1 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -5164,8 +5164,37 @@ (define-public rust-rsa-0.5
("rust-sha2" ,rust-sha2-0.9)
("rust-sha3" ,rust-sha3-0.9))))))
+(define-public rust-rust-argon2-1
+ (package
+ (name "rust-rust-argon2")
+ (version "1.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "rust-argon2" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1z0v2kcmqdb61jh6y26797x1rlkqx0y57l88z3gnrgphzn9m9255"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-base64-0.21
+ rust-blake2b-simd-1
+ rust-constant-time-eq-0.3
+ rust-crossbeam-utils-0.8
+ rust-serde-1)
+ #:cargo-development-inputs (list rust-hex-0.4)))
+ (home-page "https://github.com/sru-systems/rust-argon2")
+ (synopsis "Argon2 password hashing function in Rust")
+ (description
+ "This package provides a Rust implementation of the Argon2 password
+hashing function.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-rust-argon2-0.8
(package
+ (inherit rust-rust-argon2-1)
(name "rust-rust-argon2")
(version "0.8.3")
(source
@@ -5175,7 +5204,6 @@ (define-public rust-rust-argon2-0.8
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1yvqkv04fqk3cbvyasibr4bqbxa6mij8jdvibakwlcsbjh6q462b"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
@@ -5183,13 +5211,7 @@ (define-public rust-rust-argon2-0.8
("rust-blake2b-simd" ,rust-blake2b-simd-0.5)
("rust-constant-time-eq" ,rust-constant-time-eq-0.1)
("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
- ("rust-serde" ,rust-serde-1))))
- (home-page "https://github.com/sru-systems/rust-argon2")
- (synopsis "Argon2 password hashing function in Rust")
- (description
- "This package provides a Rust implementation of the Argon2 password
-hashing function.")
- (license (list license:expat license:asl2.0))))
+ ("rust-serde" ,rust-serde-1))))))
(define-public rust-rust-argon2-0.7
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 29/81] gnu: Add rust-ruma-0.9-1.5495b85.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (27 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 28/81] gnu: Add rust-rust-argon2-1 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 30/81] gnu: Add matrix-conduit Herman Rimm via Guix-patches via
` (51 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076
* gnu/packages/matrix.scm (rust-ruma-0.9-1.5495b85): Add variable.
Change-Id: I3b8b64559945bf311d05add33b06e8c84bf0eb5b
---
gnu/packages/matrix.scm | 92 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 92 insertions(+)
diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm
index 32ae62fcb4..7a29100d3f 100644
--- a/gnu/packages/matrix.scm
+++ b/gnu/packages/matrix.scm
@@ -25,6 +25,10 @@ (define-module (gnu packages matrix)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages check)
#:use-module (gnu packages crypto)
+ #:use-module (gnu packages crates-crypto)
+ #:use-module (gnu packages crates-graphics)
+ #:use-module (gnu packages crates-io)
+ #:use-module (gnu packages crates-web)
#:use-module (gnu packages databases)
#:use-module (gnu packages glib)
#:use-module (gnu packages monitoring)
@@ -34,6 +38,7 @@ (define-module (gnu packages matrix)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages xml)
+ #:use-module (guix build-system cargo)
#:use-module (guix build-system pyproject)
#:use-module (guix build-system python)
#:use-module (guix download)
@@ -91,6 +96,93 @@ (define-public python-matrix-synapse-ldap3
an LDAP server.")
(license license:asl2.0)))
+(define rust-ruma-0.9-1.5495b85
+ (let ((commit "5495b85aa311c2805302edb0a7de40399e22b397"))
+ (package
+ (name "rust-ruma")
+ (version (git-version "0.9.4" "1" commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ruma/ruma.git")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0q0vx1qk7rmg2ss6phr97b87m01gjfsh8lvpnfl0sp3q5wrgcb10"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list #:skip-build? #t ;; From the workspace Cargo.toml.
+ #:cargo-inputs (list rust-as-variant-1
+ rust-assert-matches2-0.1
+ rust-assign-1
+ rust-base64-0.21
+ rust-criterion-0.5
+ rust-http-0.2
+ rust-js-int-0.2
+ rust-maplit-1
+ rust-serde-1
+ rust-serde-html-form-0.2
+ rust-serde-json-1
+ rust-thiserror-1
+ rust-tracing-0.1
+ ;; client
+ rust-async-stream-0.3
+ rust-bytes-1
+ rust-futures-core-0.3
+ rust-futures-lite-1
+ rust-hyper-0.14
+ rust-hyper-rustls-0.24
+ rust-isahc-1
+ rust-reqwest-0.11
+ ;; client-api
+ rust-js-option-0.1
+ ;; common
+ rust-form-urlencoded-1
+ rust-konst-0.3
+ rust-percent-encoding-2
+ rust-time-0.3
+ rust-url-2
+ rust-uuid-1
+ rust-web-time-1
+ rust-wildmatch-2
+ ;; html
+ rust-html5ever-0.26
+ rust-phf-0.11
+ ;; macros
+ rust-once-cell-1
+ rust-proc-macro-crate-2
+ rust-proc-macro2-1
+ rust-quote-1
+ rust-syn-2
+ rust-toml-0.8
+ ;; server-util
+ rust-headers-0.3
+ rust-yap-0.11
+ ;; signatures
+ rust-ed25519-dalek-2
+ rust-pkcs8-0.10
+ rust-rand-0.8
+ rust-sha2-0.10
+ rust-subslice-0.2
+ ;; state-res
+ rust-itertools-0.11)
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Invoke 'cargo package' even when #:skip-build? #t,
+ ;; to package workspace members individually.
+ (replace 'package
+ (lambda _
+ (invoke "cargo" "package" "--no-metadata"
+ "--no-verify"))))))
+ (home-page "https://github.com/ruma/ruma/")
+ (synopsis "Ruma workspace checkout for matrix-conduit")
+ (description
+ "This package provides the ruma workspace checkout used by the
+matrix-conduit package.")
+ (license license:expat))))
+
(define-public synapse
(package
(name "synapse")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 30/81] gnu: Add matrix-conduit.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (28 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 29/81] gnu: Add rust-ruma-0.9-1.5495b85 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 31/81] gnu: Add rust-rustls-platform-verifier-android-0.1 Herman Rimm via Guix-patches via
` (50 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076
* gnu/packages/matrix.scm (matrix-conduit): Add variable.
Change-Id: Icae14162197c19fc3421147dd34cf9df8e5a56ff
---
gnu/packages/matrix.scm | 84 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 84 insertions(+)
diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm
index 7a29100d3f..3abbdd32e4 100644
--- a/gnu/packages/matrix.scm
+++ b/gnu/packages/matrix.scm
@@ -24,6 +24,7 @@
(define-module (gnu packages matrix)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages check)
+ #:use-module (gnu packages compression)
#:use-module (gnu packages crypto)
#:use-module (gnu packages crates-crypto)
#:use-module (gnu packages crates-graphics)
@@ -31,7 +32,9 @@ (define-module (gnu packages matrix)
#:use-module (gnu packages crates-web)
#:use-module (gnu packages databases)
#:use-module (gnu packages glib)
+ #:use-module (gnu packages llvm)
#:use-module (gnu packages monitoring)
+ #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-check)
#:use-module (gnu packages python-crypto)
@@ -183,6 +186,87 @@ (define rust-ruma-0.9-1.5495b85
matrix-conduit package.")
(license license:expat))))
+(define-public matrix-conduit
+ (package
+ (name "matrix-conduit")
+ (version "0.7.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://gitlab.com/famedly/conduit/-/archive/v"
+ version "/conduit-v" version ".tar.gz"))
+ (sha256
+ (base32 "0cgqbfh3nf7y13hn2bdgi4slchiwmxiiz3bypj9raffh3blhmnwx"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin (substitute* "Cargo.toml"
+ ;; Remove unused dependencies.
+ (("^lazy_static.*") "")
+ (("^tikv-jemalloc-ctl.*") "")
+ (("\"tikv-jemalloc-ctl\", ") "")
+ ;; Provide vendored ruma dependency.
+ (("git =.*, rev =.*, features")
+ "version = \"0.9.4-1.5495b85\", features"))))))
+ (build-system cargo-build-system)
+ (arguments
+ (list #:install-source? #f
+ #:cargo-inputs (list rust-async-trait-0.1
+ rust-axum-0.6
+ rust-axum-server-0.5
+ rust-bytes-1
+ rust-base64-0.21
+ rust-clap-4
+ rust-directories-4
+ rust-futures-util-0.3
+ rust-figment-0.10
+ rust-hmac-0.12
+ rust-http-0.2
+ rust-hyper-0.14
+ rust-image-0.24
+ rust-jsonwebtoken-9
+ rust-lru-cache-0.1
+ rust-num-cpus-1
+ rust-nix-0.28
+ rust-opentelemetry-0.18
+ rust-opentelemetry-jaeger-0.17
+ rust-parking-lot-0.12
+ rust-persy-1
+ rust-rand-0.8
+ rust-regex-1
+ rust-reqwest-0.11
+ rust-ring-0.17
+ ;; Include workspace transitive closure.
+ rust-ruma-0.9-1.5495b85
+ rust-rust-argon2-1
+ rust-rust-rocksdb-0.24
+ rust-rusqlite-0.29
+ rust-sd-notify-0.4
+ rust-serde-1
+ rust-serde-html-form-0.2
+ rust-serde-json-1
+ rust-serde-yaml-0.9
+ rust-sha-1-0.10
+ rust-thiserror-1
+ rust-threadpool-1
+ rust-thread-local-1
+ rust-tikv-jemallocator-0.5
+ rust-tokio-1
+ rust-tower-0.4
+ rust-tower-http-0.4
+ rust-tracing-0.1
+ rust-tracing-flame-0.2
+ rust-tracing-opentelemetry-0.18
+ rust-tracing-subscriber-0.3
+ rust-trust-dns-resolver-0.22)))
+ ;; Include workspace members.
+ (inputs (list rust-ruma-0.9-1.5495b85 zlib (list zstd "lib")))
+ (native-inputs (list clang pkg-config))
+ (home-page "https://conduit.rs")
+ (synopsis "Matrix homeserver written in Rust")
+ (description "This package provides a Matrix homeserver written in Rust.")
+ (license license:asl2.0)))
+
(define-public synapse
(package
(name "synapse")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 31/81] gnu: Add rust-rustls-platform-verifier-android-0.1.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (29 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 30/81] gnu: Add matrix-conduit Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 32/81] gnu: Add rust-android-log-sys-0.3 Herman Rimm via Guix-patches via
` (49 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-tls.scm
(rust-rustls-platform-verifier-android-0.1): Add variable.
Change-Id: I1517434c152a2c463c087c90e5dc9e9a4c1cfda7
---
gnu/packages/crates-tls.scm | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index 9f7863f197..72d9609b5d 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -1466,6 +1466,25 @@ (define-public rust-rustls-pki-types-1
(description "Shared types for the rustls PKI ecosystem.")
(license (list license:expat license:asl2.0))))
+(define-public rust-rustls-platform-verifier-android-0.1
+ (package
+ (name "rust-rustls-platform-verifier-android")
+ (version "0.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "rustls-platform-verifier-android" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1b8p86f6nc2x271a18zl7lbjkggy6058q3yk6mdnnin8zpkigql4"))))
+ (build-system cargo-build-system)
+ (home-page "https://github.com/rustls/rustls-platform-verifier")
+ (synopsis "rustls-platform-verifier internal JVM support component")
+ (description
+ "This package provides the internal JVM support component of
+rustls-platform-verifier. You shouldn't depend on this directly.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-rustls-webpki-0.102
(package
(name "rust-rustls-webpki")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 32/81] gnu: Add rust-android-log-sys-0.3.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (30 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 31/81] gnu: Add rust-rustls-platform-verifier-android-0.1 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 33/81] gnu: Add rust-android-logger-0.13 Herman Rimm via Guix-patches via
` (48 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-android-log-sys-0.3): Add variable.
(rust-android-log-sys-0.2): Inherit from rust-android-log-sys-0.3.
Change-Id: I432f1d580746a693851b8b2d360b4d8ece2304af
---
gnu/packages/crates-io.scm | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f170b04efb..e7902fec50 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1536,24 +1536,38 @@ (define-public rust-android-glue-0.2
(description "This package provides the glue for the Android JNI.")
(license license:expat)))
-(define-public rust-android-log-sys-0.2
+(define-public rust-android-log-sys-0.3
(package
(name "rust-android-log-sys")
- (version "0.2.0")
+ (version "0.3.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "android_log-sys" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0bhhs1cgzp9vzjvkn2q31ppc7w4am5s273hkvl5iac5475kmp5l5"))))
- (arguments `(#:skip-build? #true)) ;XXX: Android only
+ (base32 "0dwrvwkx2xxqys6nrhfavbbqfx2rs61nq8akrlnqkfbapxb81k2y"))))
(build-system cargo-build-system)
- (home-page "https://github.com/nercury/android_log-sys-rs")
+ (arguments `(#:skip-build? #true)) ;XXX: Android only
+ (home-page "https://github.com/rust-mobile/android_log-sys-rs")
(synopsis "FFI bindings to Android log Library")
(description "This package provides FFI bindings to Android log Library.")
(license (list license:expat license:asl2.0))))
+(define-public rust-android-log-sys-0.2
+ (package
+ (inherit rust-android-log-sys-0.3)
+ (name "rust-android-log-sys")
+ (version "0.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "android_log-sys" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0bhhs1cgzp9vzjvkn2q31ppc7w4am5s273hkvl5iac5475kmp5l5"))))))
+
(define-public rust-android-log-sys-0.1
(package
(inherit rust-android-log-sys-0.2)
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 33/81] gnu: Add rust-android-logger-0.13.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (31 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 32/81] gnu: Add rust-android-log-sys-0.3 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 34/81] gnu: rust-security-framework-sys-2: Update to 2.11.0 Herman Rimm via Guix-patches via
` (47 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-android-logger-0.13): Add variable.
(rust-android-logger-0.11): Inherit from rust-android-logger-0.13.
Change-Id: I63838f75071ed3867f3fd36b1a3950fffd4171ed
---
gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++--------
1 file changed, 27 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e7902fec50..9485ed62d4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1582,8 +1582,34 @@ (define-public rust-android-log-sys-0.1
(base32 "0klq7cp4lm74gjf9p12zdjcr159blbicrfvadmaqvfxbi8njw1dq"))))
(arguments `(#:skip-build? #true)))) ;XXX: Android only
+(define-public rust-android-logger-0.13
+ (package
+ (name "rust-android-logger")
+ (version "0.13.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "android_logger" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0bvp6lf39q0zykn70lys562kdb14r9dfm91m79jxq53cfi7i7564"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-android-log-sys-0.3
+ rust-env-logger-0.10
+ rust-log-0.4
+ rust-once-cell-1)))
+ (home-page "https://github.com/rust-mobile/android_logger-rs")
+ (synopsis "Logging implementation for @code{log}")
+ (description
+ "This package provides a logging implementation for `log` which
+hooks to android log output.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-android-logger-0.11
(package
+ (inherit rust-android-logger-0.13)
(name "rust-android-logger")
(version "0.11.3")
(source
@@ -1593,18 +1619,11 @@ (define-public rust-android-logger-0.11
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0fl8ix7q1cj73lzy6xcwyrqwpvnx5aaxszawidivv9ra4h6bh6c6"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-android-log-sys" ,rust-android-log-sys-0.2)
("rust-env-logger" ,rust-env-logger-0.10)
("rust-log" ,rust-log-0.4)
- ("rust-once-cell" ,rust-once-cell-1))))
- (home-page "https://github.com/rust-mobile/android_logger-rs")
- (synopsis "Logging implementation for @code{log}")
- (description
- "This library is a drop-in replacement for @code{env_logger}. Instead,
-it outputs messages to Android's logcat.")
- (license (list license:expat license:asl2.0))))
+ ("rust-once-cell" ,rust-once-cell-1))))))
(define-public rust-android-logger-0.10
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 34/81] gnu: rust-security-framework-sys-2: Update to 2.11.0.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (32 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 33/81] gnu: Add rust-android-logger-0.13 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 35/81] gnu: rust-security-framework-2: " Herman Rimm via Guix-patches via
` (46 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-apple.scm (rust-security-framework-sys-2): Update
from 2.9.2 to 2.11.0.
Change-Id: Id6c4ceda64cc5ce6712e0d8ce797bcc770bffb5f
---
gnu/packages/crates-apple.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index 11ceb517d3..bc8c0db934 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -1349,14 +1349,14 @@ (define-public rust-security-framework-0.2
(define-public rust-security-framework-sys-2
(package
(name "rust-security-framework-sys")
- (version "2.9.1")
+ (version "2.11.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "security-framework-sys" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0yhciwlsy9dh0ps1gw3197kvyqx1bvc4knrhiznhid6kax196cp9"))))
+ (base32 "1mq7ykz3fi0ba55aj4afz24v9qvwdpkbjiirb197f8h5pnxkcy9i"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 35/81] gnu: rust-security-framework-2: Update to 2.11.0.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (33 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 34/81] gnu: rust-security-framework-sys-2: Update to 2.11.0 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 36/81] gnu: rust-webpki-0.102: Update to 0.102.4 Herman Rimm via Guix-patches via
` (45 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-apple.scm (rust-security-framework-2): Update from
2.9.2 to 2.11.0.
[cargo-inputs]: Replace rust-x509-parser-0.15 with 0.16.
Change-Id: Ib9f2af5c2e3b80c3547cb384fbafb48168806a17
---
gnu/packages/crates-apple.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index bc8c0db934..4d9dc1103b 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -1237,14 +1237,14 @@ (define-public rust-readkey-0.1
(define-public rust-security-framework-2
(package
(name "rust-security-framework")
- (version "2.9.2")
+ (version "2.11.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "security-framework" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1pplxk15s5yxvi2m1sz5xfmjibp96cscdcl432w9jzbk0frlzdh5"))))
+ (base32 "1h0ipvv8wi9wvhad0a9w7jpmb189jng4jhfgnp6vl1lps0zp49y6"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f ;missing files
@@ -1261,7 +1261,7 @@ (define-public rust-security-framework-2
("rust-hex" ,rust-hex-0.4)
("rust-tempdir" ,rust-tempdir-0.3)
("rust-time" ,rust-time-0.3)
- ("rust-x509-parser" ,rust-x509-parser-0.15))))
+ ("rust-x509-parser" ,rust-x509-parser-0.16))))
(home-page "https://lib.rs/crates/security_framework")
(synopsis "@code{Security.framework} bindings for macOS and iOS")
(description "This package provides @code{Security.framework} bindings for
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 36/81] gnu: rust-webpki-0.102: Update to 0.102.4.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (34 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 35/81] gnu: rust-security-framework-2: " Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 37/81] gnu: Add rust-rustls-platform-verifier-0.3 Herman Rimm via Guix-patches via
` (44 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-tls.scm (rust-webpki-0.102): Update from 0.102.1
to 0.102.4.
[cargo-development-inputs]: Replace rust-base64-0.21 with 0.22 and
rust-rcgen-0.12 with 0.13.
Change-Id: I8195ddeb2daed16efe2addbb6107515820d76742
---
gnu/packages/crates-tls.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index 72d9609b5d..1069bf7e17 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -1488,14 +1488,14 @@ (define-public rust-rustls-platform-verifier-android-0.1
(define-public rust-rustls-webpki-0.102
(package
(name "rust-rustls-webpki")
- (version "0.102.1")
+ (version "0.102.4")
(source
(origin
(method url-fetch)
(uri (crate-uri "rustls-webpki" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0nz9d3xhy8cg6anmvq64scyiva8bglrc6j3v6bdxw2f96xha4k7g"))))
+ (base32 "0gmk2abk7y2cdppqlaqmnhcv690p19af9n66sjvw84z9j9z8yi7z"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f
@@ -1503,11 +1503,11 @@ (define-public rust-rustls-webpki-0.102
("rust-ring" ,rust-ring-0.17)
("rust-rustls-pki-types" ,rust-rustls-pki-types-1)
("rust-untrusted" ,rust-untrusted-0.9))
- #:cargo-development-inputs (("rust-base64" ,rust-base64-0.21)
+ #:cargo-development-inputs (("rust-base64" ,rust-base64-0.22)
("rust-bencher" ,rust-bencher-0.1)
("rust-bzip2" ,rust-bzip2-0.4)
("rust-once-cell" ,rust-once-cell-1)
- ("rust-rcgen" ,rust-rcgen-0.12)
+ ("rust-rcgen" ,rust-rcgen-0.13)
("rust-serde" ,rust-serde-1)
("rust-serde-json" ,rust-serde-json-1))))
(home-page "https://github.com/rustls/webpki")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 37/81] gnu: Add rust-rustls-platform-verifier-0.3.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (35 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 36/81] gnu: rust-webpki-0.102: Update to 0.102.4 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 38/81] gnu: Add rust-oid-registry-0.7 Herman Rimm via Guix-patches via
` (43 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-tls.scm (rust-rustls-platform-verifier-0.3): Add
variable.
Change-Id: Idac3b4a08759517923b7a8830ca3ffce6f771aa1
---
gnu/packages/crates-tls.scm | 56 +++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index 1069bf7e17..9d2f989bdc 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -1466,6 +1466,62 @@ (define-public rust-rustls-pki-types-1
(description "Shared types for the rustls PKI ecosystem.")
(license (list license:expat license:asl2.0))))
+(define-public rust-rustls-platform-verifier-0.3
+ (package
+ (name "rust-rustls-platform-verifier")
+ (version "0.3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "rustls-platform-verifier" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0z8m3j3kpap26gwjaicmrd5096i8140qz1lhjl7pjg6fl5px5w5m"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-test-flags
+ (let ((real-world
+ (lambda (test)
+ (string-append
+ "--skip=tests::verification_real_world::tests::"
+ test))))
+ `(list
+ "--release" "--"
+ ,(string-append "--skip=tests::verification_mock::"
+ "test_verification_without_mock_root")
+ ,(real-world "_1password_com_valid")
+ ,(real-world "letsencrypt")
+ ,(real-world "my_1password_com_valid")
+ ,(real-world "my_1password_com_valid_no_stapled")
+ ,(real-world "unrelated_chain_not_valid_for_my_1password_com")
+ ,(real-world "unrelated_chain_valid_for_unrelated_domain")
+ ,(real-world "unrelated_domain_invalid")))
+ #:cargo-inputs (list rust-android-logger-0.13
+ rust-base64-0.21
+ rust-core-foundation-0.9
+ rust-core-foundation-sys-0.8
+ rust-jni-0.19
+ rust-log-0.4
+ rust-once-cell-1
+ rust-rustls-0.23
+ rust-rustls-native-certs-0.7
+ rust-rustls-platform-verifier-android-0.1
+ rust-rustls-webpki-0.102
+ rust-security-framework-2
+ rust-security-framework-sys-2
+ rust-webpki-roots-0.26
+ rust-winapi-0.3)
+ #:cargo-development-inputs (list rust-rustls-0.23
+ rust-webpki-roots-0.26)))
+ (home-page "https://github.com/rustls/rustls-platform-verifier")
+ (synopsis "Verify TLS certs with the operating system verifier")
+ (description
+ "This package provides rustls-platform-verifier, for verifying TLS
+certificates in rustls with the operating system verifier.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-rustls-platform-verifier-android-0.1
(package
(name "rust-rustls-platform-verifier-android")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 38/81] gnu: Add rust-oid-registry-0.7.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (36 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 37/81] gnu: Add rust-rustls-platform-verifier-0.3 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 39/81] gnu: Add rust-der-parser-9 Herman Rimm via Guix-patches via
` (42 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-tls.scm (rust-oid-registry-0.7): Add variable.
(rust-oid-registry-0.6): Inherit from rust-oid-registry-0.7.
Change-Id: I13a4ce0ce2761e537839fbdac10f43df87de92b9
---
gnu/packages/crates-tls.scm | 32 ++++++++++++++++++++++++--------
1 file changed, 24 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index 9d2f989bdc..2694da4c48 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -753,8 +753,31 @@ (define-public rust-native-tls-0.2
implementation.")
(license (list license:expat license:asl2.0))))
+(define-public rust-oid-registry-0.7
+ (package
+ (name "rust-oid-registry")
+ (version "0.7.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "oid-registry" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "07cdchd80199apgf1rxjf0b4dsrlnsdkcir57jf5n926a3a8v58w"))))
+ (build-system cargo-build-system)
+ (arguments (list #:cargo-inputs (list rust-asn1-rs-0.6)))
+ (home-page "https://github.com/rusticata/oid-registry")
+ (synopsis "Object Identifier (OID) database")
+ (description
+ "This crate is a helper crate, containing a database of OID objects.
+These objects are intended for use when manipulating ASN.1 grammars and
+BER/DER encodings, for example.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-oid-registry-0.6
(package
+ (inherit rust-oid-registry-0.7)
(name "rust-oid-registry")
(version "0.6.1")
(source (origin
@@ -764,15 +787,8 @@ (define-public rust-oid-registry-0.6
(sha256
(base32
"1zwvjp3ad6gzn8g8w2hcn9a2xdap0lkzckhlnwp6rabbzdpz7vcv"))))
- (build-system cargo-build-system)
(arguments
- `(#:cargo-inputs (("rust-asn1-rs" ,rust-asn1-rs-0.5))))
- (home-page "https://github.com/rusticata/oid-registry")
- (synopsis "Object Identifier (OID) database")
- (description "This crate is a helper crate, containing a database of
-OID objects. These objects are intended for use when manipulating ASN.1
-grammars and BER/DER encodings, for example.")
- (license (list license:expat license:asl2.0))))
+ `(#:cargo-inputs (("rust-asn1-rs" ,rust-asn1-rs-0.5))))))
(define-public rust-oid-registry-0.4
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 39/81] gnu: Add rust-der-parser-9.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (37 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 38/81] gnu: Add rust-oid-registry-0.7 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 40/81] gnu: Add rust-synstructure-0.13 Herman Rimm via Guix-patches via
` (41 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-tls.scm (rust-der-parser-9): Add variable.
(rust-der-parser-8): Inherit from rust-der-parser-9.
Change-Id: I9ad041ecb124db069ebf2025293b4fd00cd5dadf
---
gnu/packages/crates-tls.scm | 43 ++++++++++++++++++++++++++++++-------
1 file changed, 35 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index 2694da4c48..105f692a08 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -631,8 +631,42 @@ (define-public rust-der-oid-macro-0.5
"This crate provides a macro to encode DER oids at compile time.")
(license (list license:expat license:asl2.0))))
+(define-public rust-der-parser-9
+ (package
+ (name "rust-der-parser")
+ (version "9.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "der-parser" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0lxmykajggvaq5mvpm2avgzwib4n9nyxii0kqaz2d5k88g3abl2w"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-asn1-rs-0.6
+ rust-cookie-factory-0.3
+ rust-displaydoc-0.2
+ rust-nom-7
+ rust-num-bigint-0.4
+ rust-num-traits-0.2
+ rust-rusticata-macros-4)
+ #:cargo-development-inputs (list rust-hex-literal-0.4
+ rust-pretty-assertions-1
+ rust-test-case-3)))
+ (home-page "https://github.com/rusticata/der-parser")
+ (synopsis "BER/DER parser written in pure Rust")
+ (description
+ "This crate provides a parser for Basic Encoding Rules (BER
+[X.690]) and Distinguished Encoding Rules (DER [X.690]), implemented
+with the @code{nom} parser combinator framework.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-der-parser-8
(package
+ (inherit rust-der-parser-9)
(name "rust-der-parser")
(version "8.2.0")
(source (origin
@@ -642,7 +676,6 @@ (define-public rust-der-parser-8
(sha256
(base32
"07mnz9y395zyxwj7nam2dbzkqdngfraxp2i7y2714dxmpbxpdmnv"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-asn1-rs" ,rust-asn1-rs-0.5)
@@ -655,13 +688,7 @@ (define-public rust-der-parser-8
#:cargo-development-inputs
(("rust-hex-literal" ,rust-hex-literal-0.3)
("rust-pretty-assertions" ,rust-pretty-assertions-1)
- ("rust-test-case" ,rust-test-case-3))))
- (home-page "https://github.com/rusticata/der-parser")
- (synopsis "BER/DER parser written in pure Rust")
- (description "This crate provides a parser for Basic Encoding Rules (BER
-[X.690]) and Distinguished Encoding Rules(DER [X.690]), implemented with the
-@code{nom} parser combinator framework.")
- (license (list license:expat license:asl2.0))))
+ ("rust-test-case" ,rust-test-case-3))))))
(define-public rust-der-parser-7
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 40/81] gnu: Add rust-synstructure-0.13.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (38 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 39/81] gnu: Add rust-der-parser-9 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 41/81] gnu: Add rust-asn1-rs-derive-0.5 Herman Rimm via Guix-patches via
` (40 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-synstructure-0.13): Add variable.
(rust-synstructure-0.12): Inherit from rust-synstructure-0.13.
Change-Id: I9326c5874a67e0ead6161f91d3dca04193c46b44
---
gnu/packages/crates-io.scm | 35 ++++++++++++++++++++++++++++-------
1 file changed, 28 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9485ed62d4..7db9254402 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -79421,8 +79421,34 @@ (define-public rust-synom-0.11
"Stripped-down Nom parser used by Syn.")
(license (list license:expat license:asl2.0))))
+(define-public rust-synstructure-0.13
+ (package
+ (name "rust-synstructure")
+ (version "0.13.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "synstructure" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0wc9f002ia2zqcbj0q2id5x6n7g1zjqba7qkg2mr0qvvmdk7dby8"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-proc-macro2-1 rust-quote-1 rust-syn-2)
+ #:cargo-development-inputs
+ (list rust-synstructure-test-traits-0.1)))
+ (home-page "https://github.com/mystor/synstructure")
+ (synopsis "Helper methods and macros for custom derives")
+ (description
+ "This package provides Helper methods and macros for custom
+derives.")
+ (license license:expat)))
+
(define-public rust-synstructure-0.12
(package
+ (inherit rust-synstructure-0.13)
(name "rust-synstructure")
(version "0.12.6")
(source
@@ -79434,7 +79460,6 @@ (define-public rust-synstructure-0.12
(sha256
(base32
"03r1lydbf3japnlpc4wka7y90pmz1i0danaj3f9a7b431akdlszk"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
@@ -79450,12 +79475,8 @@ (define-public rust-synstructure-0.12
(add-after 'unpack 'fix-test
(lambda _
(substitute* "src/lib.rs"
- (("non_upper_case_globals )") "non_upper_case_globals)")))))))
- (home-page "https://github.com/mystor/synstructure")
- (synopsis "Helper methods and macros for custom derives")
- (description
- "This package provides helper methods and macros for custom derives.")
- (license license:expat)))
+ (("non_upper_case_globals )")
+ "non_upper_case_globals)")))))))))
(define-public rust-synstructure-test-traits-0.1
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 41/81] gnu: Add rust-asn1-rs-derive-0.5.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (39 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 40/81] gnu: Add rust-synstructure-0.13 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 42/81] gnu: Add rust-asn1-rs-impl-0.2 Herman Rimm via Guix-patches via
` (39 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-tls.scm (rust-asn1-rs-derive-0.5): Add variable.
(rust-asn1-rs-derive-0.4): Inherit from rust-asn1-rs-derive-0.5.
Change-Id: I9691ef55df2a69b81f235abbcb01aad960605046
---
gnu/packages/crates-tls.scm | 35 ++++++++++++++++++++++++++++-------
1 file changed, 28 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index 105f692a08..e37d5ada0c 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -195,8 +195,35 @@ (define-public rust-asn1-rs-0.3
("rust-pem" ,rust-pem-1)
("rust-trybuild" ,rust-trybuild-1))))))
+(define-public rust-asn1-rs-derive-0.5
+ (package
+ (name "rust-asn1-rs-derive")
+ (version "0.5.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "asn1-rs-derive" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1hdabswlsqwysmb1kpyyl2nvi67z1gzxxba4lycnx5kiymgmfy3k"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-proc-macro2-1
+ rust-quote-1
+ rust-syn-2
+ rust-synstructure-0.13)))
+ (home-page "https://github.com/rusticata/asn1-rs")
+ (synopsis "Derive macros for the `asn1-rs` crate")
+ (description
+ "This package provides derive macros for the
+@code{asn1-rs} crate.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-asn1-rs-derive-0.4
(package
+ (inherit rust-asn1-rs-derive-0.5)
(name "rust-asn1-rs-derive")
(version "0.4.0")
(source (origin
@@ -206,18 +233,12 @@ (define-public rust-asn1-rs-derive-0.4
(sha256
(base32
"0v7fgmnzk7jjxv51grhwzcx5bf167nlqwk3vcmq7xblf5s4karbj"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
("rust-syn" ,rust-syn-1)
- ("rust-synstructure" ,rust-synstructure-0.12))))
- (home-page "https://github.com/rusticata/asn1-rs")
- (synopsis "Derive macros for the `asn1-rs` crate")
- (description
- "This package provides derive macros for the @code{asn1-rs} crate.")
- (license (list license:expat license:asl2.0))))
+ ("rust-synstructure" ,rust-synstructure-0.12))))))
(define-public rust-asn1-rs-derive-0.1
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 42/81] gnu: Add rust-asn1-rs-impl-0.2.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (40 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 41/81] gnu: Add rust-asn1-rs-derive-0.5 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 43/81] gnu: Add rust-asn1-rs-0.6 Herman Rimm via Guix-patches via
` (38 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-tls.scm (rust-asn1-rs-impl-0.2): Add variable.
(rust-asn1-rs-impl-0.1): Inherit from rust-asn1-rs-impl-0.2.
Change-Id: If86ea601b99c582e9f80712b9055661f09819281
---
gnu/packages/crates-tls.scm | 33 ++++++++++++++++++++++++++-------
1 file changed, 26 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index e37d5ada0c..991508a2d0 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -258,8 +258,33 @@ (define-public rust-asn1-rs-derive-0.1
("rust-syn" ,rust-syn-1)
("rust-synstructure" ,rust-synstructure-0.12))))))
+(define-public rust-asn1-rs-impl-0.2
+ (package
+ (name "rust-asn1-rs-impl")
+ (version "0.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "asn1-rs-impl" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1xv56m0wrwix4av3w86sih1nsa5g1dgfz135lz1qdznn5h60a63v"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list #:cargo-inputs (list rust-proc-macro2-1
+ rust-quote-1
+ rust-syn-2)))
+ (home-page "https://github.com/rusticata/asn1-rs")
+ (synopsis "Implementation details for the `asn1-rs` crate")
+ (description
+ "This package provides implementation details for the
+@code{asn1-rs} crate.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-asn1-rs-impl-0.1
(package
+ (inherit rust-asn1-rs-impl-0.2)
(name "rust-asn1-rs-impl")
(version "0.1.0")
(source (origin
@@ -269,17 +294,11 @@ (define-public rust-asn1-rs-impl-0.1
(sha256
(base32
"1va27bn7qxqp4wanzjlkagnynv6jnrhnwmcky2ahzb1r405p6xr7"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
- ("rust-syn" ,rust-syn-1))))
- (home-page "https://github.com/rusticata/asn1-rs")
- (synopsis "Implementation details for the `asn1-rs` crate")
- (description
- "This package provides implementation details for the @code{asn1-rs} crate.")
- (license (list license:expat license:asl2.0))))
+ ("rust-syn" ,rust-syn-1))))))
(define-public rust-async-native-tls-0.3
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 43/81] gnu: Add rust-asn1-rs-0.6.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (41 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 42/81] gnu: Add rust-asn1-rs-impl-0.2 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 44/81] gnu: Add rust-x509-parser-0.16 Herman Rimm via Guix-patches via
` (37 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-tls.scm (rust-asn1-rs-0.6): Add variable.
(rust-asn1-rs-0.5): Inherit from rust-asn1-rs-0.6.
Change-Id: Ie0a87f742a7ad8165ba870f950f214209b808c82
---
gnu/packages/crates-tls.scm | 44 ++++++++++++++++++++++++++++++++-----
1 file changed, 38 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index 991508a2d0..addba26f3a 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -129,8 +129,45 @@ (define-public rust-asn1-derive-0.13
("rust-quote" ,rust-quote-1)
("rust-syn" ,rust-syn-1))))))
+(define-public rust-asn1-rs-0.6
+ (package
+ (name "rust-asn1-rs")
+ (version "0.6.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "asn1-rs" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "17a2sb40l1wk542hhlj8rf8iabhmqymrm4skxiq0zykyfmri7b92"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-asn1-rs-derive-0.5
+ rust-asn1-rs-impl-0.2
+ rust-bitvec-1
+ rust-cookie-factory-0.3
+ rust-displaydoc-0.2
+ rust-nom-7
+ rust-num-bigint-0.4
+ rust-num-traits-0.2
+ rust-rusticata-macros-4
+ rust-thiserror-1
+ rust-time-0.3)
+ #:cargo-development-inputs (list rust-colored-2
+ rust-hex-literal-0.4
+ rust-pem-3
+ rust-trybuild-1)))
+ (home-page "https://github.com/rusticata/asn1-rs")
+ (synopsis "Parser/encoder for ASN.1 BER/DER data")
+ (description
+ "This package provides a parser and encoder for ASN.1 BER and DER
+data.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-asn1-rs-0.5
(package
+ (inherit rust-asn1-rs-0.6)
(name "rust-asn1-rs")
(version "0.5.2")
(source (origin
@@ -140,7 +177,6 @@ (define-public rust-asn1-rs-0.5
(sha256
(base32
"1w7zq0392qs7kkv0nzw50bfqvq7q9zxv48fsp3sxyl83mzfxavvz"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-asn1-rs-derive" ,rust-asn1-rs-derive-0.4)
@@ -159,11 +195,7 @@ (define-public rust-asn1-rs-0.5
("rust-hex-literal" ,rust-hex-literal-0.3)
("rust-oid-registry" ,rust-oid-registry-0.6)
("rust-pem" ,rust-pem-1)
- ("rust-trybuild" ,rust-trybuild-1))))
- (home-page "https://github.com/rusticata/asn1-rs")
- (synopsis "Parser/encoder for ASN.1 BER/DER data")
- (description "Parser/encoder for ASN.1 BER/DER data")
- (license (list license:expat license:asl2.0))))
+ ("rust-trybuild" ,rust-trybuild-1))))))
(define-public rust-asn1-rs-0.3
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 44/81] gnu: Add rust-x509-parser-0.16.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (42 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 43/81] gnu: Add rust-asn1-rs-0.6 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 45/81] gnu: rust-rustls-pki-types-1: Update to 1.7.0 Herman Rimm via Guix-patches via
` (36 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-tls.scm (rust-x509-parser-0.16): Add variable.
(rust-x509-parser-0.15): Inherit from rust-x509-parser-0.16.
Change-Id: I516d1cb1a6e79a38e26177ca7b011c80bd6fcf01
---
gnu/packages/crates-tls.scm | 40 ++++++++++++++++++++++++++++++-------
1 file changed, 33 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index addba26f3a..b90e11b9a1 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -1805,8 +1805,40 @@ (define-public rust-x509-cert-0.2
Public Key Infrastructure Certificate format as described in RFC 5280.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-x509-parser-0.16
+ (package
+ (name "rust-x509-parser")
+ (version "0.16.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "x509-parser" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0s8zyl6fafkzpylcpcn08bmcmrzzcb6gfjx2h8zny3bh60pidg7w"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list #:tests? #f ;missing files
+ #:cargo-inputs (list rust-asn1-rs-0.6
+ rust-data-encoding-2
+ rust-der-parser-9
+ rust-lazy-static-1
+ rust-nom-7
+ rust-oid-registry-0.7
+ rust-ring-0.17
+ rust-rusticata-macros-4
+ rust-thiserror-1
+ rust-time-0.3)))
+ (home-page "https://github.com/rusticata/x509-parser")
+ (synopsis "X.509 parser written in pure Rust")
+ (description
+ "This package provides Parser for the X.509 v3 format (RFC 5280
+certificates).")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-x509-parser-0.15
(package
+ (inherit rust-x509-parser-0.16)
(name "rust-x509-parser")
(version "0.15.1")
(source (origin
@@ -1816,7 +1848,6 @@ (define-public rust-x509-parser-0.15
(sha256
(base32
"1nk3ryam7yzsza735xdypkv1i4c35gqlygax5jyr74bbnsjznsbh"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-asn1-rs" ,rust-asn1-rs-0.5)
@@ -1828,12 +1859,7 @@ (define-public rust-x509-parser-0.15
("rust-ring" ,rust-ring-0.16)
("rust-rusticata-macros" ,rust-rusticata-macros-4)
("rust-thiserror" ,rust-thiserror-1)
- ("rust-time" ,rust-time-0.3))))
- (home-page "https://github.com/rusticata/x509-parser")
- (synopsis "X.509 parser written in pure Rust")
- (description "This crate provides a parser for the X.509 v3 format (RFC
-5280 certificates).")
- (license (list license:expat license:asl2.0))))
+ ("rust-time" ,rust-time-0.3))))))
(define-public rust-x509-parser-0.14
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 45/81] gnu: rust-rustls-pki-types-1: Update to 1.7.0.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (43 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 44/81] gnu: Add rust-x509-parser-0.16 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 46/81] gnu: Add rust-rcgen-0.13 Herman Rimm via Guix-patches via
` (35 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-tls.scm (rust-rustls-pki-types-1): Update from
1.0.1 to 1.7.0.
[cargo-inputs]: Add rust-web-time-1.
[description]: Use a main verb.
Change-Id: I99ed053da676b76773a68745b93c3ec73ba83a30
---
gnu/packages/crates-tls.scm | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index b90e11b9a1..9cc93ccad4 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -1567,18 +1567,20 @@ (define-public rust-rustls-pemfile-0.2
(define-public rust-rustls-pki-types-1
(package
(name "rust-rustls-pki-types")
- (version "1.0.1")
+ (version "1.7.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "rustls-pki-types" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "16rkx6gn5l2zximxy8fx9h2vzks1hfxi5z5cd9y97r0fl853wrz7"))))
+ (base32 "0banlc9xzwqrx8n0h4bd0igmq3z5hc72rn941lf22cp3gkkraqlp"))))
(build-system cargo-build-system)
+ (arguments (list #:cargo-inputs (list rust-web-time-1)))
(home-page "https://github.com/rustls/pki-types")
(synopsis "Shared types for the rustls PKI ecosystem")
- (description "Shared types for the rustls PKI ecosystem.")
+ (description
+ "This package provides shared types for the rustls PKI ecosystem.")
(license (list license:expat license:asl2.0))))
(define-public rust-rustls-platform-verifier-0.3
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 46/81] gnu: Add rust-rcgen-0.13.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (44 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 45/81] gnu: rust-rustls-pki-types-1: Update to 1.7.0 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 47/81] gnu: Add rust-rustls-0.23 Herman Rimm via Guix-patches via
` (34 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-tls.scm (rust-rcgen-0.13): Add variable.
(rust-rcgen-0.12): Inherit from rust-rcgen-0.13.
Change-Id: I340df02301dd0bfbd3badc2cd38779216492b0d9
---
gnu/packages/crates-tls.scm | 54 ++++++++++++++++++++++++++++++-------
1 file changed, 44 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index 9cc93ccad4..382a162dad 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -935,8 +935,51 @@ (define-public rust-oid-registry-0.2
`(#:skip-build? #t
#:cargo-inputs (("rust-der-parser" ,rust-der-parser-6))))))
+(define-public rust-rcgen-0.13
+ (package
+ (name "rust-rcgen")
+ (version "0.13.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "rcgen" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0yb7lg0pd1j66jr0kacs5z8q66fb9izkvsp11ma8hry4f8c7w1sl"))
+ (modules '((guix build utils)))
+ ;; Don't use a vendored botan.
+ (snippet '(substitute* "Cargo.toml"
+ ((".*vendored.*") "")))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-aws-lc-rs-1
+ rust-pem-3
+ rust-ring-0.17
+ rust-rustls-pki-types-1
+ rust-time-0.3
+ rust-x509-parser-0.16
+ rust-yasna-0.5
+ rust-zeroize-1)
+ #:cargo-development-inputs (list rust-botan-0.10
+ rust-openssl-0.10
+ rust-rand-0.8
+ rust-ring-0.17
+ rust-rsa-0.9
+ rust-rustls-pki-types-1
+ rust-rustls-webpki-0.102
+ rust-x509-parser-0.16)))
+ (native-inputs (list pkg-config))
+ (inputs (list botan openssl))
+ (home-page "https://github.com/rustls/rcgen")
+ (synopsis "Rust X.509 certificate generator")
+ (description
+ "This package provides Rust X.509 certificate generator.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-rcgen-0.12
(package
+ (inherit rust-rcgen-0.13)
(name "rust-rcgen")
(version "0.12.1")
(source (origin
@@ -952,7 +995,6 @@ (define-public rust-rcgen-0.12
;; Don't use a vendored botan.
(substitute* "Cargo.toml"
((".*vendored.*") ""))))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-aws-lc-rs" ,rust-aws-lc-rs-1)
@@ -969,15 +1011,7 @@ (define-public rust-rcgen-0.12
("rust-ring" ,rust-ring-0.17)
("rust-rsa" ,rust-rsa-0.9)
("rust-rustls-webpki" ,rust-rustls-webpki-0.101)
- ("rust-x509-parser" ,rust-x509-parser-0.15))))
- (native-inputs
- (list pkg-config))
- (inputs
- (list botan openssl))
- (home-page "https://github.com/rustls/rcgen")
- (synopsis "Rust X.509 certificate generator")
- (description "Rust X.509 certificate generator.")
- (license (list license:expat license:asl2.0))))
+ ("rust-x509-parser" ,rust-x509-parser-0.15))))))
(define-public rust-rcgen-0.11
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 47/81] gnu: Add rust-rustls-0.23.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (45 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 46/81] gnu: Add rust-rcgen-0.13 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 48/81] gnu: Add rust-base64-0.22 Herman Rimm via Guix-patches via
` (33 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-tls.scm (rust-rustls-0.23): Add variable.
(rust-rustls-0.22): Inherit from rust-rustls-0.23.
Change-Id: I0f75c871cd6d0c66304796e3bfed395380f8ec0e
---
gnu/packages/crates-tls.scm | 64 ++++++++++++++++++++++++++++++-------
1 file changed, 52 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index 382a162dad..05f5d5538c 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -40,6 +40,7 @@ (define-module (gnu packages crates-tls)
#:use-module (gnu packages crates-windows)
#:use-module (gnu packages crypto)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages jemalloc)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages rust-apps)
@@ -1146,8 +1147,52 @@ (define-public rust-rcgen-0.8
("rust-webpki" ,rust-webpki-0.22)
("rust-x509-parser" ,rust-x509-parser-0.12))))))
+(define-public rust-rustls-0.23
+ (package
+ (name "rust-rustls")
+ (version "0.23.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "rustls" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0yv7bh16rwhn6fnlb3wnixb2y4in9gf3z3ysa8k3zbgh3nbdpfzb"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:tests? #f ; Not all files included.
+ #:cargo-inputs (list rust-aws-lc-rs-1
+ rust-hashbrown-0.14
+ rust-log-0.4
+ rust-once-cell-1
+ rust-ring-0.17
+ rust-rustls-pki-types-1
+ rust-rustls-webpki-0.102
+ rust-rustversion-1
+ rust-subtle-2
+ rust-zeroize-1)
+ #:cargo-development-inputs (list rust-base64-0.22
+ rust-bencher-0.1
+ rust-env-logger-0.10
+ rust-log-0.4
+ rust-num-bigint-0.4
+ rust-rcgen-0.13
+ rust-rustls-pemfile-2
+ rust-tikv-jemallocator-0.5
+ rust-time-0.3
+ rust-webpki-roots-0.26)
+ #:phases override-jemalloc))
+ (native-inputs (list cmake-minimal pkg-config jemalloc))
+ (home-page "https://github.com/rustls/rustls")
+ (synopsis "Modern TLS library written in Rust")
+ (description
+ "This package provides a modern TLS library written in Rust.")
+ (license (list license:asl2.0 license:isc license:expat))))
+
(define-public rust-rustls-0.22
(package
+ (inherit rust-rustls-0.23)
(name "rust-rustls")
(version "0.22.2")
(source
@@ -1157,7 +1202,6 @@ (define-public rust-rustls-0.22
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0hcxyhq6ynvws9v5b2h81s1nwmijmya7a3vyyyhsy1wqpmb9jz78"))))
- (build-system cargo-build-system)
(arguments
`(#:tests? #f ; Not all files included.
#:cargo-inputs (("rust-aws-lc-rs" ,rust-aws-lc-rs-1)
@@ -1168,17 +1212,13 @@ (define-public rust-rustls-0.22
("rust-rustversion" ,rust-rustversion-1)
("rust-subtle" ,rust-subtle-2)
("rust-zeroize" ,rust-zeroize-1))
- #:cargo-development-inputs (("rust-base64" ,rust-base64-0.21)
- ("rust-bencher" ,rust-bencher-0.1)
- ("rust-env-logger" ,rust-env-logger-0.10)
- ("rust-log" ,rust-log-0.4)
- ("rust-rustls-pemfile" ,rust-rustls-pemfile-2)
- ("rust-webpki-roots" ,rust-webpki-roots-0.26))))
- (home-page "https://github.com/rustls/rustls")
- (synopsis "Modern TLS library written in Rust")
- (description
- "This package provides a modern TLS library written in Rust.")
- (license (list license:asl2.0 license:isc license:expat))))
+ #:cargo-development-inputs
+ (("rust-base64" ,rust-base64-0.21)
+ ("rust-bencher" ,rust-bencher-0.1)
+ ("rust-env-logger" ,rust-env-logger-0.10)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-rustls-pemfile" ,rust-rustls-pemfile-2)
+ ("rust-webpki-roots" ,rust-webpki-roots-0.26))))))
(define-public rust-rustls-0.21
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 48/81] gnu: Add rust-base64-0.22.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (46 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 47/81] gnu: Add rust-rustls-0.23 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 49/81] gnu: Add rust-tokio-rustls-0.26 Herman Rimm via Guix-patches via
` (32 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-base64-0.22): Add variable.
(rust-base64-0.21): Inherit from rust-base64-0.22.
Change-Id: Iffdb4052a09ba793f1f1cdb5c0a8748d23a168aa
---
gnu/packages/crates-io.scm | 46 +++++++++++++++++++++++++-------------
1 file changed, 30 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7db9254402..72e2c25df8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -6951,8 +6951,37 @@ (define-public rust-base58-0.1
c6e7d37. However, this package works only up to 128 bytes.")
(license license:expat)))
+(define-public rust-base64-0.22
+ (package
+ (name "rust-base64")
+ (version "0.22.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "base64" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1imqzgh7bxcikp5vx3shqvw9j09g9ly0xr0jma0q66i52r7jbcvj"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list #:cargo-development-inputs (list rust-clap-3
+ rust-criterion-0.4
+ rust-once-cell-1
+ rust-rand-0.8
+ rust-rstest-0.13
+ rust-rstest-reuse-0.6
+ rust-strum-0.25)))
+ (home-page "https://github.com/marshallpierce/rust-base64")
+ (synopsis "Encodes and decodes base64 as bytes or utf8")
+ (description
+ "This package provides base64 encoding and decoding to bytes or
+utf8.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-base64-0.21
(package
+ (inherit rust-base64-0.22)
(name "rust-base64")
(version "0.21.7")
(source (origin
@@ -6961,22 +6990,7 @@ (define-public rust-base64-0.21
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0rw52yvsk75kar9wgqfwgb414kvil1gn7mqkrhn9zf1537mpsacx"))))
- (build-system cargo-build-system)
- (arguments
- `(#:cargo-development-inputs
- (("rust-clap" ,rust-clap-3)
- ("rust-criterion" ,rust-criterion-0.4)
- ("rust-once-cell" ,rust-once-cell-1)
- ("rust-rand" ,rust-rand-0.8)
- ("rust-rstest" ,rust-rstest-0.13)
- ("rust-rstest-reuse" ,rust-rstest-reuse-0.6)
- ("rust-strum" ,rust-strum-0.25))))
- (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))))
+ "0rw52yvsk75kar9wgqfwgb414kvil1gn7mqkrhn9zf1537mpsacx"))))))
(define-public rust-base64-0.20
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 49/81] gnu: Add rust-tokio-rustls-0.26.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (47 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 48/81] gnu: Add rust-base64-0.22 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 50/81] gnu: Add rust-hyper-rustls-0.27 Herman Rimm via Guix-patches via
` (31 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-tokio-rustls-0.26): Add variable.
(rust-tokio-rustls-0.25): Inherit from rust-tokio-rustls-0.26.
Change-Id: I301c40cb70f576b8478328044c3abffdb3ab190c
---
gnu/packages/crates-io.scm | 50 ++++++++++++++++++++++++++++++++------
1 file changed, 42 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 72e2c25df8..d7311a7d55 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -84708,8 +84708,49 @@ (define-public rust-tokio-reactor-0.1
"Event loop that drives Tokio I/O resources.")
(license license:expat)))
+(define-public rust-tokio-rustls-0.26
+ (package
+ (name "rust-tokio-rustls")
+ (version "0.26.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tokio-rustls" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1m00czrmk8x7pdjnz10a3da3i1d0sdf9j9vfp5dnk5ss1q6w8yqc"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-test-flags
+ `(list "--release" "--"
+ ,(string-append "--skip=common::test_stream::stream_"
+ "handshake_regression_issues_77")
+ "--skip=test_modern"
+ "--skip=test_modern_vectored"
+ "--skip=test_tls12"
+ "--skip=test_tls12_vectored")
+ #:cargo-inputs (list rust-rustls-0.23
+ rust-rustls-pki-types-1
+ rust-tokio-1)
+ #:cargo-development-inputs (list rust-argh-0.1
+ rust-futures-util-0.3
+ rust-lazy-static-1
+ rust-rustls-pemfile-2
+ rust-tokio-1
+ rust-webpki-roots-0.26)))
+ (native-inputs (list cmake-minimal))
+ (home-page "https://github.com/rustls/tokio-rustls")
+ (synopsis "Asynchronous TLS/SSL streams for Tokio")
+ (description
+ "This package provides Asynchronous TLS/SSL streams for Tokio using
+Rustls.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-tokio-rustls-0.25
(package
+ (inherit rust-tokio-rustls-0.26)
(name "rust-tokio-rustls")
(version "0.25.0")
(source
@@ -84719,7 +84760,6 @@ (define-public rust-tokio-rustls-0.25
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "03w6d5aqqf084rmcmrsyq5grhydl53blaiqcl0i2yfnv187hqpkp"))))
- (build-system cargo-build-system)
(arguments
`(#:tests? #f ; Issue with the certificate test dates.
#:cargo-inputs (("rust-rustls" ,rust-rustls-0.22)
@@ -84731,13 +84771,7 @@ (define-public rust-tokio-rustls-0.25
("rust-rustls-pemfile" ,rust-rustls-pemfile-2)
("rust-rustls-webpki" ,rust-rustls-webpki-0.102)
("rust-tokio" ,rust-tokio-1)
- ("rust-webpki-roots" ,rust-webpki-roots-0.26))))
- (home-page "https://github.com/tokio-rs/tls")
- (synopsis "Asynchronous TLS/SSL streams for Tokio")
- (description
- "This package provides asynchronous TLS/SSL streams for Tokio using
-Rustls.")
- (license (list license:expat license:asl2.0))))
+ ("rust-webpki-roots" ,rust-webpki-roots-0.26))))))
(define-public rust-tokio-rustls-0.24
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 50/81] gnu: Add rust-hyper-rustls-0.27.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (48 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 49/81] gnu: Add rust-tokio-rustls-0.26 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 51/81] gnu: Add rust-hyper-tls-0.6 Herman Rimm via Guix-patches via
` (30 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-web.scm (rust-hyper-rustls-0.27): Add variable.
(rust-hyper-rustls-0.24): Inherit from rust-hyper-rustls-0.27.
Change-Id: Idc2d731a72f3ed88adf27a7fc4793a97382df691
---
gnu/packages/crates-web.scm | 52 ++++++++++++++++++++++++++++++++-----
1 file changed, 45 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 6629bc9327..8291a42318 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -33,6 +33,7 @@ (define-module (gnu packages crates-web)
#:use-module (guix utils)
#:use-module (guix gexp)
#:use-module (gnu packages)
+ #:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
#:use-module (gnu packages crates-apple)
#:use-module (gnu packages crates-crypto)
@@ -3746,8 +3747,51 @@ (define-public rust-hyper-proxy-0.9
(description "Proxy connector for the Hyper HTTP library.")
(license license:expat)))
+(define-public rust-hyper-rustls-0.27
+ (package
+ (name "rust-hyper-rustls")
+ (version "0.27.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "hyper-rustls" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0arh47qg9ln3l8q4x9wcpwmsq4j1cc08mimw3sh3g86pjs3b72wh"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:tests? #f
+ #:cargo-inputs (list rust-futures-util-0.3
+ rust-http-1
+ rust-hyper-1
+ rust-hyper-util-0.1
+ rust-log-0.4
+ rust-rustls-0.23
+ rust-rustls-native-certs-0.7
+ rust-rustls-pki-types-1
+ rust-rustls-platform-verifier-0.3
+ rust-tokio-1
+ rust-tokio-rustls-0.26
+ rust-tower-service-0.3
+ rust-webpki-roots-0.26)
+ #:cargo-development-inputs (list rust-http-body-util-0.1
+ rust-hyper-util-0.1
+ rust-rustls-0.23
+ rust-rustls-pemfile-2
+ rust-tokio-1)))
+ (native-inputs (list cmake-minimal))
+ (home-page "https://github.com/rustls/hyper-rustls")
+ (synopsis "Rustls+hyper integration for pure rust HTTPS")
+ (description
+ "This package provides Rustls+hyper integration for pure rust
+HTTPS.")
+ (license (list license:asl2.0 license:isc license:expat))))
+
(define-public rust-hyper-rustls-0.24
(package
+ (inherit rust-hyper-rustls-0.27)
(name "rust-hyper-rustls")
(version "0.24.2")
(source
@@ -3757,7 +3801,6 @@ (define-public rust-hyper-rustls-0.24
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1475j4a2nczz4aajzzsq3hpwg1zacmzbqg393a14j80ff8izsgpc"))))
- (build-system cargo-build-system)
(arguments
`(#:tests? #f ; Not all files included.
#:cargo-inputs (("rust-futures-util" ,rust-futures-util-0.3)
@@ -3772,12 +3815,7 @@ (define-public rust-hyper-rustls-0.24
#:cargo-development-inputs (("rust-hyper" ,rust-hyper-0.14)
("rust-rustls" ,rust-rustls-0.21)
("rust-rustls-pemfile" ,rust-rustls-pemfile-1)
- ("rust-tokio" ,rust-tokio-1))))
- (home-page "https://github.com/rustls/hyper-rustls")
- (synopsis "Rustls+Hyper integration for pure Rust HTTPS")
- (description
- "This package provides Rustls+Hyper integration for pure Rust HTTPS.")
- (license (list license:asl2.0 license:isc license:expat))))
+ ("rust-tokio" ,rust-tokio-1))))))
(define-public rust-hyper-rustls-0.23
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 51/81] gnu: Add rust-hyper-tls-0.6.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (49 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 50/81] gnu: Add rust-hyper-rustls-0.27 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 52/81] gnu: Add rust-h3-0.0.4 Herman Rimm via Guix-patches via
` (29 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-web.scm (rust-hyper-tls-0.6): Add variable.
(rust-hyper-tls-0.5): Inherit from rust-hyper-tls-0.6.
Change-Id: Ibfec1c3a4e906e93ec2f0793029c37559c682097
---
gnu/packages/crates-web.scm | 43 +++++++++++++++++++++++++++++++------
1 file changed, 36 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 8291a42318..12706984ab 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -3959,8 +3959,43 @@ (define-public rust-hyper-timeout-0.4
to be used with Hyper client.")
(license (list license:expat license:asl2.0))))
+(define-public rust-hyper-tls-0.6
+ (package
+ (name "rust-hyper-tls")
+ (version "0.6.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "hyper-tls" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1q36x2yps6hhvxq5r7mc8ph9zz6xlb573gx0x3yskb0fi736y83h"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-bytes-1
+ rust-http-body-util-0.1
+ rust-hyper-1
+ rust-hyper-util-0.1
+ rust-native-tls-0.2
+ rust-tokio-1
+ rust-tokio-native-tls-0.3
+ rust-tower-service-0.3)
+ #:cargo-development-inputs (list rust-hyper-util-0.1
+ rust-tokio-1)))
+ (native-inputs (list pkg-config))
+ (inputs (list openssl))
+ (home-page "https://hyper.rs")
+ (synopsis "Default TLS implementation for use with hyper")
+ (description
+ "This package provides the default TLS implementation for use with
+hyper.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-hyper-tls-0.5
(package
+ (inherit rust-hyper-tls-0.6)
(name "rust-hyper-tls")
(version "0.5.0")
(source
@@ -3970,7 +4005,6 @@ (define-public rust-hyper-tls-0.5
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "01crgy13102iagakf6q4mb75dprzr7ps1gj0l5hxm1cvm7gks66n"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
@@ -3978,12 +4012,7 @@ (define-public rust-hyper-tls-0.5
("rust-hyper" ,rust-hyper-0.14)
("rust-native-tls" ,rust-native-tls-0.2)
("rust-tokio" ,rust-tokio-1)
- ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3))))
- (home-page "https://hyper.rs")
- (synopsis "Default TLS implementation for use with hyper")
- (description "This package provides the default TLS implementation for use
-with hyper.")
- (license (list license:expat license:asl2.0))))
+ ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3))))))
(define-public rust-hyper-tls-0.4
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 52/81] gnu: Add rust-h3-0.0.4.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (50 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 51/81] gnu: Add rust-hyper-tls-0.6 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 53/81] gnu: Add rust-h3-quinn-0.0.5 Herman Rimm via Guix-patches via
` (28 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-web.scm (rust-h3-0.0.4): Add variable.
(rust-h3-0.0.3): Inherit from rust-h3-0.0.4.
Change-Id: I9d6cae92e738b2d0e27a6885237daf5b9c1e6cd2
---
gnu/packages/crates-web.scm | 59 +++++++++++++++++++++++++++++++++----
1 file changed, 53 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 12706984ab..30df5dd9fa 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -2558,8 +2558,60 @@ (define-public rust-h2-0.1
("rust-webpki" ,rust-webpki-0.21)
("rust-webpki-roots" ,rust-webpki-roots-0.17))))))
+(define-public rust-h3-0.0.4
+ (package
+ (name "rust-h3")
+ (version "0.0.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "h3" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "04clhh6b5iqlgnbppikbz4zpxl78g4vkyhyrjgnyg4vfkrmqij5i"))
+ (modules '((guix build utils)))
+ (snippet '(begin
+ (substitute* "src/tests/mod.rs"
+ (("../h3-quinn")
+ "guix-vendor/rust-h3-quinn-0.0.5.tar.gz"))
+ (substitute* "Cargo.toml"
+ (("\"tls-rustls\"")
+ "\"tls-rustls\",\n\"futures-io\""))))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-test-flags
+ `(list "release" "--"
+ "--skip=server_and_client_should_connect_successfully")
+ #:cargo-inputs (list rust-bytes-1
+ rust-fastrand-2
+ rust-futures-util-0.3
+ rust-http-1
+ rust-pin-project-lite-0.2
+ rust-tokio-1
+ rust-tracing-0.1)
+ #:cargo-development-inputs (list rust-assert-matches-1
+ rust-futures-0.3
+ rust-futures-util-0.3
+ rust-h3-quinn-0.0.5
+ rust-proptest-1
+ rust-quinn-0.10
+ rust-quinn-proto-0.10
+ rust-rcgen-0.11
+ rust-rustls-0.21
+ rust-tokio-1
+ rust-tokio-util-0.7
+ rust-tracing-subscriber-0.3)))
+ (home-page "https://github.com/hyperium/h3")
+ (synopsis "Async HTTP/3 implementation")
+ (description
+ "This package provides an async HTTP/3 implementation.")
+ (license license:expat)))
+
(define-public rust-h3-0.0.3
(package
+ (inherit rust-h3-0.0.4)
(name "rust-h3")
(version "0.0.3")
(source
@@ -2569,7 +2621,6 @@ (define-public rust-h3-0.0.3
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "101vg73galsyk5gnjb49cjb6q40c9z2npcdxpfsj99ky2waijgmq"))))
- (build-system cargo-build-system)
(arguments
`(#:tests? #f ; Not all files included
#:cargo-inputs
@@ -2591,11 +2642,7 @@ (define-public rust-h3-0.0.3
("rust-rustls" ,rust-rustls-0.21)
("rust-tokio" ,rust-tokio-1)
("rust-tokio-util" ,rust-tokio-util-0.7)
- ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))
- (home-page "https://github.com/hyperium/h3")
- (synopsis "Async HTTP/3 implementation")
- (description "This package provides an async HTTP/3 implementation.")
- (license license:expat)))
+ ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))))
(define-public rust-h3-0.0.2
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 53/81] gnu: Add rust-h3-quinn-0.0.5.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (51 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 52/81] gnu: Add rust-h3-0.0.4 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:58 ` [bug#71076] [PATCH 54/81] gnu: rust-pin-project-internal-1: Update to 1.1.5 Herman Rimm via Guix-patches via
` (27 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-web.scm (rust-h3-quinn-0.0.5): Add variable.
(rust-h3-quinn-0.0.4): Inherit from rust-h3-quinn-0.0.5.
Change-Id: Ia9725c6f61e902c6b80dd8fbc1f9328e21daad7f
---
gnu/packages/crates-web.scm | 37 ++++++++++++++++++++++++++++++-------
1 file changed, 30 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 30df5dd9fa..88d73d8b73 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -2665,8 +2665,37 @@ (define-public rust-h3-0.0.2
("rust-tokio" ,rust-tokio-1)
("rust-tracing" ,rust-tracing-0.1))))))
+(define-public rust-h3-quinn-0.0.5
+ (package
+ (name "rust-h3-quinn")
+ (version "0.0.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "h3-quinn" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0ii06bi5a19k4qfkppn5019nw8xca2wzfl66cax949jc1v66ny3k"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-bytes-1
+ rust-futures-0.3
+ rust-h3-0.0.4
+ rust-quinn-0.10
+ rust-quinn-proto-0.10
+ rust-tokio-1
+ rust-tokio-util-0.7)))
+ (home-page "https://github.com/hyperium/h3")
+ (synopsis "QUIC transport implementation based on Quinn")
+ (description
+ "This package provides a QUIC transport implementation based on
+Quinn.")
+ (license license:expat)))
+
(define-public rust-h3-quinn-0.0.4
(package
+ (inherit rust-h3-quinn-0.0.5)
(name "rust-h3-quinn")
(version "0.0.4")
(source
@@ -2676,7 +2705,6 @@ (define-public rust-h3-quinn-0.0.4
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1r0sm0j51crlfpy2j1wfhgpg2lrfq2xmf5qjd98ksg3h9l0pb5mc"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-bytes" ,rust-bytes-1)
("rust-futures" ,rust-futures-0.3)
@@ -2684,12 +2712,7 @@ (define-public rust-h3-quinn-0.0.4
("rust-quinn" ,rust-quinn-0.10)
("rust-quinn-proto" ,rust-quinn-proto-0.10)
("rust-tokio" ,rust-tokio-1)
- ("rust-tokio-util" ,rust-tokio-util-0.7))))
- (home-page "https://github.com/hyperium/h3")
- (synopsis "QUIC transport implementation based on Quinn")
- (description
- "This package provides QUIC transport implementation based on Quinn.")
- (license license:expat)))
+ ("rust-tokio-util" ,rust-tokio-util-0.7))))))
(define-public rust-h3-quinn-0.0.3
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 54/81] gnu: rust-pin-project-internal-1: Update to 1.1.5.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (52 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 53/81] gnu: Add rust-h3-quinn-0.0.5 Herman Rimm via Guix-patches via
@ 2024-05-20 8:58 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 55/81] gnu: rust-pin-project-1: " Herman Rimm via Guix-patches via
` (26 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:58 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-pin-project-internal-1): Update to
1.1.5.
[cargo-inputs]: Replace rust-syn-1 with 2.
Change-Id: Ie422dee709b1a4e214c976f2c3ca0bd01c55b08d
---
gnu/packages/crates-io.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d7311a7d55..5e84613442 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -55510,21 +55510,21 @@ (define-public rust-pin-project-0.4
(define-public rust-pin-project-internal-1
(package
(name "rust-pin-project-internal")
- (version "1.0.12")
+ (version "1.1.5")
(source
(origin
(method url-fetch)
(uri (crate-uri "pin-project-internal" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0maa6icn7rdfy4xvgfaq7m7bwpw9f19wg76f1ncsiixd0lgdp6q6"))))
+ (base32 "0r9r4ivwiyqf45sv6b30l1dx282lxaax2f6gl84jwa3q590s8f1g"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #false
#:cargo-inputs
(("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
- ("rust-syn" ,rust-syn-1))))
+ ("rust-syn" ,rust-syn-2))))
(home-page "https://github.com/taiki-e/pin-project")
(synopsis "Implementation detail of the @code{pin-project} crate")
(description
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 55/81] gnu: rust-pin-project-1: Update to 1.1.5.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (53 preceding siblings ...)
2024-05-20 8:58 ` [bug#71076] [PATCH 54/81] gnu: rust-pin-project-internal-1: Update to 1.1.5 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 56/81] gnu: Add rust-wasm-streams-0.4 Herman Rimm via Guix-patches via
` (25 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-pin-project-1): Update to 1.1.5.
[arguments]: Disable tests.
Change-Id: I84defca9c0a89e1e30c908da6e8c5398a0458ff5
---
gnu/packages/crates-io.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5e84613442..af3d248094 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -55457,17 +55457,18 @@ (define-public rust-pikchr-0.1
(define-public rust-pin-project-1
(package
(name "rust-pin-project")
- (version "1.0.12")
+ (version "1.1.5")
(source
(origin
(method url-fetch)
(uri (crate-uri "pin-project" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1k3f9jkia3idxl2pqxamszwnl89dk52fa4jqj3p7zmmwnq4scadd"))))
+ (base32 "1cxl146x0q7lawp0m1826wsgj8mmmfs6ja8q7m6f7ff5j6vl7gxn"))))
(build-system cargo-build-system)
(arguments
- `(#:cargo-inputs
+ `(#:tests? #f ;... use of undeclared crate or module `macrotest`
+ #:cargo-inputs
(("rust-pin-project-internal" ,rust-pin-project-internal-1))
#:cargo-development-inputs
(("rust-macrotest" ,rust-macrotest-1)
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 56/81] gnu: Add rust-wasm-streams-0.4.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (54 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 55/81] gnu: rust-pin-project-1: " Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 57/81] gnu: Add rust-reqwest-0.12 Herman Rimm via Guix-patches via
` (24 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-wasm-streams-0.4): Add variable.
(rust-wasm-streams-0.3): Inherit from rust-wasm-streams-0.4.
Change-Id: I0bd465d7cd93fa26227d31a6395d9ef905da26d3
---
gnu/packages/crates-io.scm | 50 +++++++++++++++++++++++++++++---------
1 file changed, 39 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index af3d248094..e2d85674d2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -91957,8 +91957,40 @@ (define-public rust-wasm-encoder-0.38
"This package provides a low-level @code{WebAssembly} encoder.")
(license license:asl2.0)))
+(define-public rust-wasm-streams-0.4
+ (package
+ (name "rust-wasm-streams")
+ (version "0.4.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "wasm-streams" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0ad17c59xb8fffsnbrqbyqz93hb66nzxhizpii31icb31g4w8pdn"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-futures-util-0.3
+ rust-js-sys-0.3
+ rust-wasm-bindgen-0.2
+ rust-wasm-bindgen-futures-0.4
+ rust-web-sys-0.3)
+ #:cargo-development-inputs (list rust-pin-project-1
+ rust-tokio-1
+ rust-wasm-bindgen-test-0.3
+ rust-web-sys-0.3)))
+ (home-page "https://github.com/MattiasBuelens/wasm-streams/")
+ (synopsis "Bridge web and Rust streams with Wasm")
+ (description
+ "This package provides bridging between web streams and Rust
+streams using WebAssembly.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-wasm-streams-0.3
(package
+ (inherit rust-wasm-streams-0.4)
(name "rust-wasm-streams")
(version "0.3.0")
(source
@@ -91968,22 +92000,18 @@ (define-public rust-wasm-streams-0.3
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1iqa4kmhbsjj8k4q15i1x0x4p3xda0dhbg7zw51mydr4g129sq5l"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-futures-util" ,rust-futures-util-0.3)
("rust-js-sys" ,rust-js-sys-0.3)
("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
- ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)
+ ("rust-wasm-bindgen-futures"
+ ,rust-wasm-bindgen-futures-0.4)
("rust-web-sys" ,rust-web-sys-0.3))
- #:cargo-development-inputs (("rust-pin-project" ,rust-pin-project-1)
- ("rust-tokio" ,rust-tokio-1)
- ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)
- ("rust-web-sys" ,rust-web-sys-0.3))))
- (home-page "https://github.com/MattiasBuelens/wasm-streams/")
- (synopsis "Bridge between web streams and Rust streams using WebAssembly")
- (description
- "Bridging between web streams and Rust streams using WebAssembly.")
- (license (list license:expat license:asl2.0))))
+ #:cargo-development-inputs
+ (("rust-pin-project" ,rust-pin-project-1)
+ ("rust-tokio" ,rust-tokio-1)
+ ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)
+ ("rust-web-sys" ,rust-web-sys-0.3))))))
(define-public rust-wasm-streams-0.2
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 57/81] gnu: Add rust-reqwest-0.12.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (55 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 56/81] gnu: Add rust-wasm-streams-0.4 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 58/81] gnu: rust-ruma-identifiers-validation-0.9: Update to 0.9.5 Herman Rimm via Guix-patches via
` (23 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-web.scm (rust-reqwest-0.12): Add variable.
(rust-reqwest-0.11): Inherit from rust-reqwest-0.12.
Change-Id: Ib43e1c0f0cb51d956289c50e968119a5a343abea
---
gnu/packages/crates-web.scm | 108 ++++++++++++++++++++++++++++++++----
1 file changed, 98 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 88d73d8b73..771aae94b5 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -4812,8 +4812,105 @@ (define-public rust-poem-derive-1
(description "This package provides macros for poem.")
(license (list license:expat license:asl2.0))))
+(define-public rust-reqwest-0.12
+ (package
+ (name "rust-reqwest")
+ (version "0.12.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "reqwest" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "047aa0qnngnlnf9i0abrs6pgmz15vk81p5pvscwhk3l6jbfsyv2n"))
+ (modules '((guix build utils)))
+ (snippet '(begin
+ (substitute* "Cargo.toml.orig"
+ (("hyper-rustls = \\{ version = \"0.26.0\"")
+ "hyper-rustls = { version = \"0.27.1\""))
+ (copy-file "Cargo.toml.orig" "Cargo.toml")))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-test-flags `(list "release" "--"
+ ;; Tests require network access.
+ "--skip=test_badssl_modern"
+ "--skip=test_badssl_self_signed")
+ #:cargo-inputs (list rust-async-compression-0.4
+ rust-base64-0.22
+ rust-bytes-1
+ rust-cookie-0.17
+ rust-cookie-store-0.20
+ rust-encoding-rs-0.8
+ rust-futures-channel-0.3
+ rust-futures-core-0.3
+ rust-futures-util-0.3
+ rust-h2-0.4
+ rust-h3-0.0.4
+ rust-h3-quinn-0.0.5
+ rust-hickory-resolver-0.24
+ rust-http-1
+ rust-http-body-1
+ rust-http-body-util-0.1
+ rust-hyper-1
+ rust-hyper-rustls-0.27 ; actually 0.26
+ rust-hyper-tls-0.6
+ rust-hyper-util-0.1
+ rust-ipnet-2
+ rust-js-sys-0.3
+ rust-log-0.4
+ rust-mime-0.3
+ rust-mime-guess-2
+ rust-native-tls-0.2
+ rust-once-cell-1
+ rust-percent-encoding-2
+ rust-pin-project-lite-0.2
+ rust-quinn-0.10
+ rust-rustls-0.22
+ rust-rustls-native-certs-0.7
+ rust-rustls-pemfile-2
+ rust-rustls-pki-types-1
+ rust-serde-1
+ rust-serde-json-1
+ rust-serde-urlencoded-0.7
+ rust-sync-wrapper-0.1
+ rust-system-configuration-0.5
+ rust-tokio-1
+ rust-tokio-native-tls-0.3
+ rust-tokio-rustls-0.25
+ rust-tokio-socks-0.5
+ rust-tokio-util-0.7
+ rust-tower-service-0.3
+ rust-url-2
+ rust-wasm-bindgen-0.2
+ rust-wasm-bindgen-futures-0.4
+ rust-wasm-streams-0.4
+ rust-web-sys-0.3
+ rust-webpki-roots-0.26
+ rust-winreg-0.52)
+ #:cargo-development-inputs (list rust-brotli-3
+ rust-doc-comment-0.3
+ rust-env-logger-0.10
+ rust-futures-util-0.3
+ rust-hyper-1
+ rust-hyper-util-0.1
+ rust-libflate-1
+ rust-serde-1
+ rust-tokio-1
+ rust-wasm-bindgen-0.2
+ rust-wasm-bindgen-test-0.3
+ rust-zstd-0.13)))
+ (inputs (list openssl (list zstd "lib")))
+ (native-inputs (list pkg-config))
+ (home-page "https://github.com/seanmonstar/reqwest")
+ (synopsis "Higher level HTTP client library")
+ (description
+ "This package provides a higher level HTTP client library.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-reqwest-0.11
(package
+ (inherit rust-reqwest-0.12)
(name "rust-reqwest")
(version "0.11.23")
(source
@@ -4823,7 +4920,6 @@ (define-public rust-reqwest-0.11
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0hgvzb7r46656r9vqhl5qk1kbr2xzjb91yr2cb321160ka6sxc9p"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-test-flags
'("--release" "--"
@@ -4892,15 +4988,7 @@ (define-public rust-reqwest-0.11
("rust-serde" ,rust-serde-1)
("rust-tokio" ,rust-tokio-1)
("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
- ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
- (inputs
- (list openssl))
- (native-inputs
- (list pkg-config))
- (home-page "https://github.com/seanmonstar/reqwest")
- (synopsis "High level HTTP client library")
- (description "This package provides a high level HTTP client library.")
- (license (list license:expat license:asl2.0))))
+ ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))))
(define-public rust-reqwest-0.10
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 58/81] gnu: rust-ruma-identifiers-validation-0.9: Update to 0.9.5.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (56 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 57/81] gnu: Add rust-reqwest-0.12 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 59/81] gnu: Add rust-ruma-macros-0.13 Herman Rimm via Guix-patches via
` (22 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-ruma-identifiers-validation-0.9):
Update to 0.9.5.
Change-Id: I02a71f5a5ee24b5a1cd89b7edc2d59baa84e22da
---
gnu/packages/crates-io.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e2d85674d2..2b40611b06 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -66803,14 +66803,14 @@ (define-public rust-ruma-html-0.1
(define-public rust-ruma-identifiers-validation-0.9
(package
(name "rust-ruma-identifiers-validation")
- (version "0.9.3")
+ (version "0.9.5")
(source
(origin
(method url-fetch)
(uri (crate-uri "ruma-identifiers-validation" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0hcviq2jzc1qcdxqh78wklb273sabv6d26wh41ygbwklj8jx32mz"))))
+ (base32 "1fpzyjwh11xqa4y6ibm1q7bddd6kk9xwbbhh1vhd87lhyms8k8wz"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-js-int" ,rust-js-int-0.2)
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 59/81] gnu: Add rust-ruma-macros-0.13.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (57 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 58/81] gnu: rust-ruma-identifiers-validation-0.9: Update to 0.9.5 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 60/81] gnu: rust-http-1: Update to 1.1.0 Herman Rimm via Guix-patches via
` (21 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-ruma-macros-0.13): Add variable.
(rust-ruma-macros-0.12): Inherit from rust-ruma-macros-0.13.
Change-Id: If1f2e618ddcfb31373b3270426bdaa9a9aff052a
---
gnu/packages/crates-io.scm | 41 ++++++++++++++++++++++++++++++--------
1 file changed, 33 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2b40611b06..73e1b2a0b7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -66844,8 +66844,38 @@ (define-public rust-ruma-identity-service-api-0.8
Matrix identity service API.")
(license license:expat)))
+(define-public rust-ruma-macros-0.13
+ (package
+ (name "rust-ruma-macros")
+ (version "0.13.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "ruma-macros" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "10i2hpl3n3jkx13b9jrzdix240ss7m7wr3cnr7n139hf6nimfs6k"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-once-cell-1
+ rust-proc-macro-crate-3
+ rust-proc-macro2-1
+ rust-quote-1
+ rust-ruma-identifiers-validation-0.9
+ rust-serde-1
+ rust-syn-2
+ rust-toml-0.8)))
+ (home-page "https://ruma.dev/")
+ (synopsis "Procedural macros used by the Ruma crates")
+ (description
+ "This package provides Procedural macros used by the Ruma crates.")
+ (license license:expat)))
+
(define-public rust-ruma-macros-0.12
(package
+ (inherit rust-ruma-macros-0.13)
(name "rust-ruma-macros")
(version "0.12.0")
(source
@@ -66855,21 +66885,16 @@ (define-public rust-ruma-macros-0.12
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "105y2inhb9z7ydkax43qfc5ws264z72gm19ji1pl2d1y9d557002"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1)
("rust-proc-macro-crate" ,rust-proc-macro-crate-2)
("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
- ("rust-ruma-identifiers-validation" ,rust-ruma-identifiers-validation-0.9)
+ ("rust-ruma-identifiers-validation"
+ ,rust-ruma-identifiers-validation-0.9)
("rust-serde" ,rust-serde-1)
("rust-syn" ,rust-syn-2)
- ("rust-toml" ,rust-toml-0.8))))
- (home-page "https://www.ruma.io/")
- (synopsis "Procedural macros used by the Ruma crates.")
- (description
- "This package provides procedural macros used by the Ruma crates.")
- (license license:expat)))
+ ("rust-toml" ,rust-toml-0.8))))))
(define-public rust-ruma-push-gateway-api-0.8
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 60/81] gnu: rust-http-1: Update to 1.1.0.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (58 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 59/81] gnu: Add rust-ruma-macros-0.13 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 61/81] gnu: Add rust-ruma-common-0.13 Herman Rimm via Guix-patches via
` (20 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-web.scm (rust-http-1): Update to 1.1.0.
Change-Id: I63bba78210b68009fdcf865fa901d99aaa198464
---
gnu/packages/crates-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 771aae94b5..19ab376805 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -3157,14 +3157,14 @@ (define-public rust-hickory-server-0.24
(define-public rust-http-1
(package
(name "rust-http")
- (version "1.0.0")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "http" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1sllw565jn8r5w7h928nsfqq33x586pyasdfr7vid01scwwgsamk"))))
+ (base32 "0n426lmcxas6h75c2cp25m933pswlrfjz10v91vc62vib2sdvf91"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-bytes" ,rust-bytes-1)
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 61/81] gnu: Add rust-ruma-common-0.13.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (59 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 60/81] gnu: rust-http-1: Update to 1.1.0 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 62/81] gnu: Add rust-markup5ever-0.12 Herman Rimm via Guix-patches via
` (19 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-ruma-common-0.13): Add variable.
(rust-ruma-common-0.12): Inherit from rust-ruma-common-0.13.
Change-Id: I80bd4727a7cf5349f1a28ad89a44f37e636f17c5
---
gnu/packages/crates-io.scm | 57 ++++++++++++++++++++++++++++++++++----
1 file changed, 51 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 73e1b2a0b7..0e2fb8c530 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -66649,8 +66649,58 @@ (define-public rust-ruma-client-api-0.17
client-server API.")
(license license:expat)))
+(define-public rust-ruma-common-0.13
+ (package
+ (name "rust-ruma-common")
+ (version "0.13.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "ruma-common" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0yzvh8cn1bpvb5vh7hrp7xax4qawmrb83zk21v0qvascrh1p5a9b"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-as-variant-1
+ rust-base64-0.22
+ rust-bytes-1
+ rust-form-urlencoded-1
+ rust-getrandom-0.2
+ rust-http-1
+ rust-indexmap-2
+ rust-js-sys-0.3
+ rust-js-int-0.2
+ rust-konst-0.3
+ rust-percent-encoding-2
+ rust-rand-0.8
+ rust-regex-1
+ rust-ruma-identifiers-validation-0.9
+ rust-ruma-macros-0.13
+ rust-serde-1
+ rust-serde-html-form-0.2
+ rust-serde-json-1
+ rust-thiserror-1
+ rust-time-0.3
+ rust-tracing-0.1
+ rust-url-2
+ rust-uuid-1
+ rust-web-time-1
+ rust-wildmatch-2)
+ #:cargo-development-inputs (list rust-assert-matches2-0.1
+ rust-assign-1
+ rust-maplit-1
+ rust-trybuild-1)))
+ (home-page "https://ruma.dev/")
+ (synopsis "Common types for other ruma crates")
+ (description
+ "This package provides common types for other ruma crates.")
+ (license license:expat)))
+
(define-public rust-ruma-common-0.12
(package
+ (inherit rust-ruma-common-0.13)
(name "rust-ruma-common")
(version "0.12.1")
(source
@@ -66696,12 +66746,7 @@ (define-public rust-ruma-common-0.12
(modify-phases %standard-phases
(add-before 'check 'ignore-broken-test
(lambda _
- (setenv "TRYBUILD" "overwrite"))))))
- (home-page "https://ruma.io/")
- (synopsis "Common types for other ruma crates")
- (description "This package provides common types for other ruma
-crates.")
- (license license:expat)))
+ (setenv "TRYBUILD" "overwrite"))))))))
(define-public rust-ruma-events-0.27
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 62/81] gnu: Add rust-markup5ever-0.12.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (60 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 61/81] gnu: Add rust-ruma-common-0.13 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 63/81] gnu: rust-typed-arena-2: Update to 2.0.2 Herman Rimm via Guix-patches via
` (18 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-markup5ever-0.12): Add variable.
(rust-markup5ever-0.11): Inherit from rust-markup5ever-0.12.
Change-Id: I0e956e49b9e3f4567bce7b705747a8a56ec4402a
---
gnu/packages/crates-io.scm | 35 ++++++++++++++++++++++++++++-------
1 file changed, 28 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0e2fb8c530..9d17055fca 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41928,8 +41928,35 @@ (define-public rust-markup-proc-macro-0.13
template engine for Rust.")
(license (list license:expat license:asl2.0))))
+(define-public rust-markup5ever-0.12
+ (package
+ (name "rust-markup5ever")
+ (version "0.12.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "markup5ever" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0idy4vjihg2dw73j2vkb5kdghvga3bwnw0qx8jwci4m6xfxkmkhn"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-log-0.4
+ rust-phf-0.11
+ rust-phf-codegen-0.11
+ rust-string-cache-0.8
+ rust-string-cache-codegen-0.5
+ rust-tendril-0.4)))
+ (home-page "https://github.com/servo/html5ever")
+ (synopsis "Common code for xml5ever and html5ever")
+ (description
+ "This package provides common code for xml5ever and html5ever.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-markup5ever-0.11
(package
+ (inherit rust-markup5ever-0.12)
(name "rust-markup5ever")
(version "0.11.0")
(source (origin
@@ -41939,7 +41966,6 @@ (define-public rust-markup5ever-0.11
(sha256
(base32
"05mhzsp6lfxla1fgd0ac283b405s6kyj27wj5r6d7wq42jxjj9ks"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-log" ,rust-log-0.4)
@@ -41947,12 +41973,7 @@ (define-public rust-markup5ever-0.11
("rust-phf-codegen" ,rust-phf-codegen-0.10)
("rust-string-cache" ,rust-string-cache-0.8)
("rust-string-cache-codegen" ,rust-string-cache-codegen-0.5)
- ("rust-tendril" ,rust-tendril-0.4))))
- (home-page "https://github.com/servo/html5ever")
- (synopsis "Common code for xml5ever and html5ever")
- (description
- "Common code for xml5ever and html5ever.")
- (license (list license:expat license:asl2.0))))
+ ("rust-tendril" ,rust-tendril-0.4))))))
(define-public rust-markup5ever-0.10
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 63/81] gnu: rust-typed-arena-2: Update to 2.0.2.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (61 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 62/81] gnu: Add rust-markup5ever-0.12 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 64/81] gnu: Add rust-html5ever-0.27 Herman Rimm via Guix-patches via
` (17 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-typed-arena-2): Update to 2.0.2.
Change-Id: Ia318eac0813c9e3c203d2ceacf869f61b5eecb1a
---
gnu/packages/crates-io.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9d17055fca..fa4acd9c6b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -87932,7 +87932,7 @@ (define-public rust-typeable-0.1
(define-public rust-typed-arena-2
(package
(name "rust-typed-arena")
- (version "2.0.1")
+ (version "2.0.2")
(source
(origin
(method url-fetch)
@@ -87941,7 +87941,7 @@ (define-public rust-typed-arena-2
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1bnhphrksp9krxhsfhfimrxvkbah2pa6rf9ygmpw5lalbm6wi186"))))
+ "0shj0jpmglhgw2f1i4b33ycdzwd1z205pbs1rd5wx7ks2qhaxxka"))))
(build-system cargo-build-system)
(arguments `(#:skip-build? #t))
(home-page "https://github.com/SimonSapin/rust-typed-arena")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 64/81] gnu: Add rust-html5ever-0.27.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (62 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 63/81] gnu: rust-typed-arena-2: Update to 2.0.2 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 65/81] gnu: Add rust-ruma-html-0.2 Herman Rimm via Guix-patches via
` (16 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-html5ever-0.27): Add variable.
(rust-html5ever-0.26): Inherit from rust-html5ever-0.27.
Change-Id: I47c692b8dc4184de5cfeccd9b29e8f7661e122df
---
gnu/packages/crates-io.scm | 38 ++++++++++++++++++++++++++++++++------
1 file changed, 32 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fa4acd9c6b..96828a5d8a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32847,8 +32847,39 @@ (define-public rust-html2pango-0.6
"This package provides a library to convert html to pango.")
(license license:gpl3+)))
+(define-public rust-html5ever-0.27
+ (package
+ (name "rust-html5ever")
+ (version "0.27.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "html5ever" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1m24sbpk572f5qhhkj4kkxvsd64rn968s0vxwvqlds76w2pp2dy1"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-log-0.4
+ rust-mac-0.1
+ rust-markup5ever-0.12
+ rust-proc-macro2-1
+ rust-quote-1
+ rust-syn-2)
+ #:cargo-development-inputs (list rust-criterion-0.3
+ rust-typed-arena-2)))
+ (home-page "https://github.com/servo/html5ever")
+ (synopsis "High-performance browser-grade HTML5 parser")
+ (description
+ "This package provides a high-performance browser-grade HTML5
+parser.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-html5ever-0.26
(package
+ (inherit rust-html5ever-0.27)
(name "rust-html5ever")
(version "0.26.0")
(source (origin
@@ -32869,12 +32900,7 @@ (define-public rust-html5ever-0.26
("rust-syn" ,rust-syn-1))
#:cargo-development-inputs
(("rust-criterion" ,rust-criterion-0.3)
- ("rust-typed-arena" ,rust-typed-arena-1))))
- (home-page "https://github.com/servo/html5ever")
- (synopsis "High-performance browser-grade HTML5 parser")
- (description
- "This package provides a high-performance browser-grade HTML5 parser.")
- (license (list license:expat license:asl2.0))))
+ ("rust-typed-arena" ,rust-typed-arena-1))))))
(define-public rust-html5ever-0.25
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 65/81] gnu: Add rust-ruma-html-0.2.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (63 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 64/81] gnu: Add rust-html5ever-0.27 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 66/81] gnu: Add rust-pulldown-cmark-escape-0.10 Herman Rimm via Guix-patches via
` (15 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-ruma-html-0.2): Add variable.
(rust-ruma-html-0.1): Inherit from rust-ruma-html-0.2.
Change-Id: Ied907617e66fff7f1ba8d9b55e5dc9cf5a1f4760
---
gnu/packages/crates-io.scm | 36 +++++++++++++++++++++++++++++-------
1 file changed, 29 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 96828a5d8a..bc5686611e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -66868,8 +66868,36 @@ (define-public rust-ruma-federation-api-0.8
Matrix server-server API.")
(license license:expat)))
+(define-public rust-ruma-html-0.2
+ (package
+ (name "rust-ruma-html")
+ (version "0.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "ruma-html" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0zrxc5cgg3p3pqpsfra7s4yla8db1hzplk1dzk8v8pysg63r8vfb"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-as-variant-1
+ rust-html5ever-0.27
+ rust-phf-0.11
+ rust-ruma-common-0.13
+ rust-tracing-0.1
+ rust-wildmatch-2)
+ #:cargo-development-inputs (list rust-assert-matches2-0.1)))
+ (home-page "https://ruma.dev/")
+ (synopsis "Opinionated HTML parsing and manipulating")
+ (description
+ "This package provides Opinionated HTML parsing and manipulating.")
+ (license license:expat)))
+
(define-public rust-ruma-html-0.1
(package
+ (inherit rust-ruma-html-0.2)
(name "rust-ruma-html")
(version "0.1.0")
(source
@@ -66879,18 +66907,12 @@ (define-public rust-ruma-html-0.1
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0nrsm1rp1psk97kvn2cjpn52a0g2kv42i9ab2zi5z5m6n54s2x4n"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-as-variant" ,rust-as-variant-1)
("rust-html5ever" ,rust-html5ever-0.26)
("rust-phf" ,rust-phf-0.11)
("rust-tracing" ,rust-tracing-0.1)
- ("rust-wildmatch" ,rust-wildmatch-2))))
- (home-page "https://www.ruma.io/")
- (synopsis "Opinionated HTML parsing and manipulating")
- (description
- "This package provides opinionated HTML parsing and manipulating.")
- (license license:expat)))
+ ("rust-wildmatch" ,rust-wildmatch-2))))))
(define-public rust-ruma-identifiers-validation-0.9
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 66/81] gnu: Add rust-pulldown-cmark-escape-0.10.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (64 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 65/81] gnu: Add rust-ruma-html-0.2 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 67/81] gnu: Add rust-pulldown-cmark-0.10 Herman Rimm via Guix-patches via
` (14 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-pulldown-cmark-escape-0.10): Add
variable.
Change-Id: Ie7ce9635bcba319c84692cddf50ba9131f50db0f
---
gnu/packages/crates-io.scm | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bc5686611e..c54b479e80 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -60415,6 +60415,25 @@ (define-public rust-pulldown-cmark-0.1
(("rust-bitflags" ,rust-bitflags-0.9)
("rust-getopts" ,rust-getopts-0.2))))))
+(define-public rust-pulldown-cmark-escape-0.10
+ (package
+ (name "rust-pulldown-cmark-escape")
+ (version "0.10.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "pulldown-cmark-escape" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1lqx7c2f0bx0qq9kkyn18gsa2dl2sk8x5jp8gvdax75w73sqyd5x"))))
+ (build-system cargo-build-system)
+ (home-page "https://github.com/raphlinus/pulldown-cmark")
+ (synopsis "Escape library for HTML created for pulldown-cmark")
+ (description
+ "This package provides an escape library for HTML created in the
+pulldown-cmark project.")
+ (license license:expat)))
+
(define-public rust-pulldown-cmark-to-cmark-10
(package
(name "rust-pulldown-cmark-to-cmark")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 67/81] gnu: Add rust-pulldown-cmark-0.10.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (65 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 66/81] gnu: Add rust-pulldown-cmark-escape-0.10 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 68/81] gnu: Add rust-ruma-events-0.28 Herman Rimm via Guix-patches via
` (13 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-pulldown-cmark-0.10): Add variable.
(rust-pulldown-cmark-0.9): Inherit from rust-pulldown-cmark-0.10.
Change-Id: I631ab9debe47464bf21a2f4ae680c781b2a4794f
---
gnu/packages/crates-io.scm | 40 +++++++++++++++++++++++++++++++-------
1 file changed, 33 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c54b479e80..855d9f62c1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -60278,8 +60278,40 @@ (define-public rust-puffin-0.18
(description "Simple instrumentation profiler for games.")
(license (list license:expat license:asl2.0))))
+(define-public rust-pulldown-cmark-0.10
+ (package
+ (name "rust-pulldown-cmark")
+ (version "0.10.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "pulldown-cmark" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "14rrzqnv6j64j75558m7gzw6lc9b24057v6415smx1z7cvm9p5vn"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-bitflags-2
+ rust-getopts-0.2
+ rust-memchr-2
+ rust-pulldown-cmark-escape-0.10
+ rust-serde-1
+ rust-unicase-2)
+ #:cargo-development-inputs (list rust-bincode-1
+ rust-criterion-0.5
+ rust-lazy-static-1 rust-regex-1
+ rust-serde-json-1)))
+ (home-page "https://github.com/raphlinus/pulldown-cmark")
+ (synopsis "pull parser for CommonMark")
+ (description
+ "This package provides a pull parser for @code{CommonMark}.")
+ (license license:expat)))
+
(define-public rust-pulldown-cmark-0.9
(package
+ (inherit rust-pulldown-cmark-0.10)
(name "rust-pulldown-cmark")
(version "0.9.3")
(source (origin
@@ -60289,7 +60321,6 @@ (define-public rust-pulldown-cmark-0.9
(sha256
(base32
"166rhmwk42ffirrzhv7lmsh9f3my6xv1ggmb66fgzv57y3qs58bp"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-bitflags" ,rust-bitflags-1)
@@ -60305,12 +60336,7 @@ (define-public rust-pulldown-cmark-0.9
("rust-markup5ever-rcdom" ,rust-markup5ever-rcdom-0.2)
("rust-regex" ,rust-regex-1)
("rust-serde-json" ,rust-serde-json-1)
- ("rust-tendril" ,rust-tendril-0.4))))
- (home-page "https://github.com/raphlinus/pulldown-cmark")
- (synopsis "Pull parser for CommonMark")
- (description
- "This package provides a pull parser for CommonMark.")
- (license license:expat)))
+ ("rust-tendril" ,rust-tendril-0.4))))))
(define-public rust-pulldown-cmark-0.8
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 68/81] gnu: Add rust-ruma-events-0.28.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (66 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 67/81] gnu: Add rust-pulldown-cmark-0.10 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 69/81] gnu: Add rust-ruma-state-res-0.11 Herman Rimm via Guix-patches via
` (12 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-ruma-events-0.28): Add variable.
(rust-ruma-events-0.27): Inherit from rust-ruma-events-0.28.
Change-Id: If5549aa7e42d2955682c9f576addc1de9aae073e
---
gnu/packages/crates-io.scm | 54 +++++++++++++++++++++++++++++++++-----
1 file changed, 47 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 855d9f62c1..e3fb988546 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -66840,8 +66840,54 @@ (define-public rust-ruma-common-0.12
(lambda _
(setenv "TRYBUILD" "overwrite"))))))))
+(define-public rust-ruma-events-0.28
+ (package
+ (name "rust-ruma-events")
+ (version "0.28.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "ruma-events" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1qq2f68wyrzga99sxcjnn0bpph5q7x3shl38040fbbhgr9gg3ppx"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-as-variant-1
+ rust-criterion-0.5
+ rust-indexmap-2
+ rust-js-int-0.2
+ rust-js-option-0.1
+ rust-percent-encoding-2
+ rust-pulldown-cmark-0.10
+ rust-regex-1
+ rust-ruma-common-0.13
+ rust-ruma-html-0.2
+ rust-ruma-identifiers-validation-0.9
+ rust-ruma-macros-0.13
+ rust-serde-1
+ rust-serde-json-1
+ rust-thiserror-1
+ rust-tracing-0.1
+ rust-url-2
+ rust-wildmatch-2)
+ #:cargo-development-inputs (list rust-assert-matches2-0.1
+ rust-assign-1
+ rust-http-1
+ rust-maplit-1
+ rust-trybuild-1)))
+ (home-page "https://ruma.dev/")
+ (synopsis "Serializable types for Matrix specification events")
+ (description
+ "This package provides Serializable types for the events in the
+Matrix specification.")
+ (license license:expat)))
+
(define-public rust-ruma-events-0.27
(package
+ (inherit rust-ruma-events-0.28)
(name "rust-ruma-events")
(version "0.27.11")
(source
@@ -66878,13 +66924,7 @@ (define-public rust-ruma-events-0.27
("rust-assign" ,rust-assign-1)
("rust-http" ,rust-http-0.2)
("rust-maplit" ,rust-maplit-1)
- ("rust-trybuild" ,rust-trybuild-1))))
- (home-page "https://ruma.io/")
- (synopsis "Serializable types for events in the Matrix specification")
- (description
- "This package provides serializable types for the events in the
-Matrix specification.")
- (license license:expat)))
+ ("rust-trybuild" ,rust-trybuild-1))))))
(define-public rust-ruma-federation-api-0.8
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 69/81] gnu: Add rust-ruma-state-res-0.11.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (67 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 68/81] gnu: Add rust-ruma-events-0.28 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 70/81] gnu: Add rust-ruma-signatures-0.15 Herman Rimm via Guix-patches via
` (11 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-ruma-state-res-0.11): Add variable.
(rust-ruma-state-res-0.10): Inherit from rust-ruma-state-res-0.11.
Change-Id: I384dcb6edd3c4c6cf35359d39c3996232451cceb
---
gnu/packages/crates-io.scm | 45 +++++++++++++++++++++++++++++++-------
1 file changed, 37 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e3fb988546..85c6926277 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -67177,8 +67177,42 @@ (define-public rust-ruma-signatures-0.14
specification.")
(license license:expat)))
+(define-public rust-ruma-state-res-0.11
+ (package
+ (name "rust-ruma-state-res")
+ (version "0.11.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "ruma-state-res" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1cayf9ki71yw4dfdsqnq5nal38v3i8mx9bh729g59mgw8gzxiz1c"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-criterion-0.5
+ rust-itertools-0.12
+ rust-js-int-0.2
+ rust-ruma-common-0.13
+ rust-ruma-events-0.28
+ rust-serde-1
+ rust-serde-json-1
+ rust-thiserror-1
+ rust-tracing-0.1)
+ #:cargo-development-inputs (list rust-maplit-1 rust-rand-0.8
+ rust-ruma-events-0.28
+ rust-tracing-subscriber-0.3)))
+ (home-page "https://ruma.dev/")
+ (synopsis "Abstraction for Matrix state resolution")
+ (description
+ "This package provides an abstraction of Matrix state resolution.")
+ (license license:expat)))
+
(define-public rust-ruma-state-res-0.10
(package
+ (inherit rust-ruma-state-res-0.11)
(name "rust-ruma-state-res")
(version "0.10.0")
(source
@@ -67187,8 +67221,8 @@ (define-public rust-ruma-state-res-0.10
(uri (crate-uri "ruma-state-res" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0hhfd4ca73bpnrfyr02k675cdc82x2yw0fah8w1s7jsm0wrb2v3q"))))
- (build-system cargo-build-system)
+ (base32
+ "0hhfd4ca73bpnrfyr02k675cdc82x2yw0fah8w1s7jsm0wrb2v3q"))))
(arguments
`(#:cargo-inputs (("rust-criterion" ,rust-criterion-0.5)
("rust-itertools" ,rust-itertools-0.11)
@@ -67203,12 +67237,7 @@ (define-public rust-ruma-state-res-0.10
(("rust-maplit" ,rust-maplit-1)
("rust-rand" ,rust-rand-0.8)
("rust-ruma-events" ,rust-ruma-events-0.27)
- ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))
- (home-page "https://www.ruma.io/")
- (synopsis "Abstraction for Matrix state resolution")
- (description "This package provides an abstraction for Matrix state
-resolution.")
- (license license:expat)))
+ ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))))
(define-public rust-run-script-0.10
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 70/81] gnu: Add rust-ruma-signatures-0.15.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (68 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 69/81] gnu: Add rust-ruma-state-res-0.11 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 71/81] gnu: Add rust-ruma-server-util-0.3 Herman Rimm via Guix-patches via
` (10 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-ruma-signatures-0.15): Add variable.
(rust-ruma-signatures-0.14): Inherit from rust-ruma-signatures-0.15.
Change-Id: Id2c8f033999be01bf9bd2f43cf64ddb2196ab9c7
---
gnu/packages/crates-io.scm | 43 +++++++++++++++++++++++++++++++-------
1 file changed, 35 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 85c6926277..ba36290d15 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -67145,8 +67145,42 @@ (define-public rust-ruma-server-util-0.2
applications.")
(license license:expat)))
+(define-public rust-ruma-signatures-0.15
+ (package
+ (name "rust-ruma-signatures")
+ (version "0.15.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "ruma-signatures" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "19ahjnayjpzbipdrkbhfynm819iyn2y3726sir9znd24iscdjaqx"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-base64-0.22
+ rust-ed25519-dalek-2
+ rust-pkcs8-0.10
+ rust-rand-0.8
+ rust-ruma-common-0.13
+ rust-serde-json-1
+ rust-sha2-0.10
+ rust-subslice-0.2
+ rust-thiserror-1)
+ #:cargo-development-inputs (list rust-assert-matches2-0.1
+ rust-insta-1)))
+ (home-page "https://ruma.dev/")
+ (synopsis "Digital signatures following the Matrix specification")
+ (description
+ "This package provides digital signatures according to the Matrix
+specification.")
+ (license license:expat)))
+
(define-public rust-ruma-signatures-0.14
(package
+ (inherit rust-ruma-signatures-0.15)
(name "rust-ruma-signatures")
(version "0.14.0")
(source
@@ -67156,7 +67190,6 @@ (define-public rust-ruma-signatures-0.14
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "12f76winxclvwgylm5kqy3bqfj7x7x9g4xzkh4nhbfrf7nrkiarh"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-base64" ,rust-base64-0.21)
("rust-ed25519-dalek" ,rust-ed25519-dalek-2)
@@ -67169,13 +67202,7 @@ (define-public rust-ruma-signatures-0.14
("rust-thiserror" ,rust-thiserror-1))
#:cargo-development-inputs
(("rust-assert-matches2" ,rust-assert-matches2-0.1)
- ("rust-insta" ,rust-insta-1))))
- (home-page "https://www.ruma.io/")
- (synopsis "Digital signatures according to the Matrix specification")
- (description
- "This package provides digital signatures according to the Matrix
-specification.")
- (license license:expat)))
+ ("rust-insta" ,rust-insta-1))))))
(define-public rust-ruma-state-res-0.11
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 71/81] gnu: Add rust-ruma-server-util-0.3.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (69 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 70/81] gnu: Add rust-ruma-signatures-0.15 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 72/81] gnu: Add rust-ruma-push-gateway-api-0.9 Herman Rimm via Guix-patches via
` (9 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-ruma-server-util-0.3): Add variable.
(rust-ruma-server-util-0.2): Inherit from rust-ruma-server-util-0.3.
Change-Id: I432cc0289492c78424eb62e2421054e861a562a1
---
gnu/packages/crates-io.scm | 37 ++++++++++++++++++++++++++++---------
1 file changed, 28 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ba36290d15..f570ef62d7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -67119,8 +67119,33 @@ (define-public rust-ruma-push-gateway-api-0.8
Matrix push gateway API.")
(license license:expat)))
+(define-public rust-ruma-server-util-0.3
+ (package
+ (name "rust-ruma-server-util")
+ (version "0.3.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "ruma-server-util" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0pn2vzsw9q6s9f3jiq6f8vhbd9w1s5s2kxz5am092cgg8655dap1"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-headers-0.4 rust-ruma-common-0.13
+ rust-tracing-0.1 rust-yap-0.12)
+ #:cargo-development-inputs (list rust-tracing-subscriber-0.3)))
+ (home-page "https://ruma.dev/")
+ (synopsis "Utilities for implementing Matrix server applications")
+ (description
+ "This package provides utilities for implementing Matrix server
+applications.")
+ (license license:expat)))
+
(define-public rust-ruma-server-util-0.2
(package
+ (inherit rust-ruma-server-util-0.3)
(name "rust-ruma-server-util")
(version "0.2.0")
(source
@@ -67129,21 +67154,15 @@ (define-public rust-ruma-server-util-0.2
(uri (crate-uri "ruma-server-util" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0sr01j9qanlyz3nj8zvdk1blhhffhgk5p13x4jjimhii988fadh8"))))
- (build-system cargo-build-system)
+ (base32
+ "0sr01j9qanlyz3nj8zvdk1blhhffhgk5p13x4jjimhii988fadh8"))))
(arguments
`(#:cargo-inputs (("rust-headers" ,rust-headers-0.3)
("rust-ruma-common" ,rust-ruma-common-0.12)
("rust-tracing" ,rust-tracing-0.1)
("rust-yap" ,rust-yap-0.11))
#:cargo-development-inputs
- (("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))
- (home-page "https://www.ruma.io/")
- (synopsis "Utilities for implementing Matrix server applications")
- (description
- "This package provides utilities for implementing Matrix server
-applications.")
- (license license:expat)))
+ (("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))))
(define-public rust-ruma-signatures-0.15
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 72/81] gnu: Add rust-ruma-push-gateway-api-0.9.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (70 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 71/81] gnu: Add rust-ruma-server-util-0.3 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 73/81] gnu: Add rust-ruma-identity-service-api-0.9 Herman Rimm via Guix-patches via
` (8 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-ruma-push-gateway-api-0.9): Add
variable.
(rust-ruma-push-gateway-api-0.8): Inherit from
rust-ruma-push-gateway-api-0.9.
Change-Id: I0e148d3c358c62c26b56098184daf304ffec11eb
---
gnu/packages/crates-io.scm | 34 +++++++++++++++++++++++++++-------
1 file changed, 27 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f570ef62d7..38f5e080b4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -67095,8 +67095,34 @@ (define-public rust-ruma-macros-0.12
("rust-syn" ,rust-syn-2)
("rust-toml" ,rust-toml-0.8))))))
+(define-public rust-ruma-push-gateway-api-0.9
+ (package
+ (name "rust-ruma-push-gateway-api")
+ (version "0.9.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "ruma-push-gateway-api" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1hifcs47xm70x63y050prms4q0zrfyjlw01d8322dd6sxmigabml"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-js-int-0.2 rust-ruma-common-0.13
+ rust-ruma-events-0.28 rust-serde-1
+ rust-serde-json-1)))
+ (home-page "https://ruma.dev/")
+ (synopsis "Types for Matrix push gateway API endpoints")
+ (description
+ "This package provides types for the endpoints in the Matrix push
+gateway API.")
+ (license license:expat)))
+
(define-public rust-ruma-push-gateway-api-0.8
(package
+ (inherit rust-ruma-push-gateway-api-0.9)
(name "rust-ruma-push-gateway-api")
(version "0.8.0")
(source
@@ -67106,18 +67132,12 @@ (define-public rust-ruma-push-gateway-api-0.8
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0ss8fylz548ygqa7p91fwdp3whf7yc51c52h7gwl6naa9mf08hzk"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-js-int" ,rust-js-int-0.2)
("rust-ruma-common" ,rust-ruma-common-0.12)
("rust-ruma-events" ,rust-ruma-events-0.27)
("rust-serde" ,rust-serde-1)
- ("rust-serde-json" ,rust-serde-json-1))))
- (home-page "https://www.ruma.io/")
- (synopsis "Types for Matrix push gateway API endpoints")
- (description "This package provides types for the endpoints in the
-Matrix push gateway API.")
- (license license:expat)))
+ ("rust-serde-json" ,rust-serde-json-1))))))
(define-public rust-ruma-server-util-0.3
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 73/81] gnu: Add rust-ruma-identity-service-api-0.9.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (71 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 72/81] gnu: Add rust-ruma-push-gateway-api-0.9 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 74/81] gnu: Add rust-ruma-federation-api-0.9 Herman Rimm via Guix-patches via
` (7 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-ruma-identity-service-api-0.9): Add
variable.
(rust-ruma-identity-service-api-0.8): Inherit from
rust-ruma-identity-service-api-0.9.
Change-Id: I0613c73a4877984a535c5c64434c191822e72351
---
gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++-------
1 file changed, 26 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 38f5e080b4..0eb3df1268 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -67020,8 +67020,33 @@ (define-public rust-ruma-identifiers-validation-0.9
and ruma-macros.")
(license license:expat)))
+(define-public rust-ruma-identity-service-api-0.9
+ (package
+ (name "rust-ruma-identity-service-api")
+ (version "0.9.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "ruma-identity-service-api" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0g9b2ygf95ffx147xhqsd1k7vgzz8f8yj3254a5ca27hi3dr3jxw"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-js-int-0.2 rust-ruma-common-0.13 rust-serde-1)
+ #:cargo-development-inputs (list rust-serde-json-1)))
+ (home-page "https://ruma.dev/")
+ (synopsis "Types for Matrix identity service API endpoints.")
+ (description
+ "This package provides types for the endpoints in the Matrix
+identity service API.")
+ (license license:expat)))
+
(define-public rust-ruma-identity-service-api-0.8
(package
+ (inherit rust-ruma-identity-service-api-0.9)
(name "rust-ruma-identity-service-api")
(version "0.8.0")
(source
@@ -67031,17 +67056,11 @@ (define-public rust-ruma-identity-service-api-0.8
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1wh9qlzlqhlmirki6i0bffp7f9d6n2jdfv26crj24xsvl02a2zgi"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-js-int" ,rust-js-int-0.2)
("rust-ruma-common" ,rust-ruma-common-0.12)
("rust-serde" ,rust-serde-1))
- #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1))))
- (home-page "https://www.ruma.io/")
- (synopsis "Types for Matrix identity service API endpoints.")
- (description "This package provides types for the endpoints in the
-Matrix identity service API.")
- (license license:expat)))
+ #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1))))))
(define-public rust-ruma-macros-0.13
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 74/81] gnu: Add rust-ruma-federation-api-0.9.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (72 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 73/81] gnu: Add rust-ruma-identity-service-api-0.9 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 75/81] gnu: Add rust-date-header-1 Herman Rimm via Guix-patches via
` (6 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-ruma-federation-api-0.9): Add
variable.
(rust-ruma-federation-api-0.8): Inherit from
rust-ruma-federation-api-0.9.
Change-Id: I90d796b4db26e5a6cb628b49dec7940631456fe1
---
gnu/packages/crates-io.scm | 36 +++++++++++++++++++++++++++++-------
1 file changed, 29 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0eb3df1268..ef2584904c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -66926,8 +66926,36 @@ (define-public rust-ruma-events-0.27
("rust-maplit" ,rust-maplit-1)
("rust-trybuild" ,rust-trybuild-1))))))
+(define-public rust-ruma-federation-api-0.9
+ (package
+ (name "rust-ruma-federation-api")
+ (version "0.9.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "ruma-federation-api" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0idgfbbl5p28l253rbx5js3g8cwy4ja7h4h5cgimarmpfamxwhza"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-js-int-0.2 rust-ruma-common-0.13
+ rust-ruma-events-0.28 rust-serde-1
+ rust-serde-json-1)
+ #:cargo-development-inputs (list rust-assert-matches2-0.1
+ rust-http-1)))
+ (home-page "https://ruma.dev/")
+ (synopsis "Types for Matrix server-server API endpoints")
+ (description
+ "This package provides types for the endpoints in the Matrix
+server-server API.")
+ (license license:expat)))
+
(define-public rust-ruma-federation-api-0.8
(package
+ (inherit rust-ruma-federation-api-0.9)
(name "rust-ruma-federation-api")
(version "0.8.0")
(source
@@ -66937,7 +66965,6 @@ (define-public rust-ruma-federation-api-0.8
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1rrzvxzjdxwpxr6d5k5yi8cz7kisqwqa3wlasm97ccmw4wgir471"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-js-int" ,rust-js-int-0.2)
("rust-ruma-common" ,rust-ruma-common-0.12)
@@ -66946,12 +66973,7 @@ (define-public rust-ruma-federation-api-0.8
("rust-serde-json" ,rust-serde-json-1))
#:cargo-development-inputs
(("rust-assert-matches2" ,rust-assert-matches2-0.1)
- ("rust-http" ,rust-http-0.2))))
- (home-page "https://www.ruma.io/")
- (synopsis "Types for Matrix server-server API endpoints")
- (description "This package provides types for the endpoints in the
-Matrix server-server API.")
- (license license:expat)))
+ ("rust-http" ,rust-http-0.2))))))
(define-public rust-ruma-html-0.2
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 75/81] gnu: Add rust-date-header-1.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (73 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 74/81] gnu: Add rust-ruma-federation-api-0.9 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 76/81] gnu: Add rust-ruma-client-api-0.18 Herman Rimm via Guix-patches via
` (5 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-date-header-1): Add variable.
Change-Id: I282de19dee2a18727c2ded2ac3867b94756eaca0
---
gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ef2584904c..f4b6d338ee 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19886,6 +19886,31 @@ (define-public rust-data-url-0.2
("rust-serde-json" ,rust-serde-json-1)
("rust-tester" ,rust-tester-0.9))))))
+(define-public rust-date-header-1
+ (package
+ (name "rust-date-header")
+ (version "1.0.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "date_header" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "078zb823qrzxj8milpk7vbmf303gmfk4nj7g4yqgnc0sxlbc80qc"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-development-inputs (list rust-criterion-0.3
+ rust-proptest-1
+ rust-regex-1)))
+ (home-page "https://github.com/jayshua/date_header")
+ (synopsis "Parse and format the HTTP 'Date:' header")
+ (description
+ "This package provides parsing and formatting for the HTTP 'Date:'
+header.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-datetime-0.5
(package
(name "rust-datetime")
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 76/81] gnu: Add rust-ruma-client-api-0.18.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (74 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 75/81] gnu: Add rust-date-header-1 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 77/81] gnu: rust-http-body-util-0.1: Update to 0.1.1 Herman Rimm via Guix-patches via
` (4 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-ruma-client-api-0.18): Add variable.
(rust-ruma-client-api-0.17): Inherit from rust-ruma-client-api-0.18.
Change-Id: I5ed54d18fa9f66dd52e5a27a82a2f558560ed063
---
gnu/packages/crates-io.scm | 47 +++++++++++++++++++++++++++++++-------
1 file changed, 39 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f4b6d338ee..434626af63 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -66733,8 +66733,46 @@ (define-public rust-ruma-client-0.12
(description "This package provides a Matrix client library.")
(license license:expat)))
+(define-public rust-ruma-client-api-0.18
+ (package
+ (name "rust-ruma-client-api")
+ (version "0.18.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "ruma-client-api" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1b9q1264g42y0a6pgxx7zxqad04fi1ps7nmi3302y07ynpbcjzps"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-as-variant-1
+ rust-assign-1
+ rust-bytes-1
+ rust-date-header-1
+ rust-http-1
+ rust-js-int-0.2
+ rust-js-option-0.1
+ rust-maplit-1
+ rust-ruma-common-0.13
+ rust-ruma-events-0.28
+ rust-serde-1
+ rust-serde-html-form-0.2
+ rust-serde-json-1
+ rust-thiserror-1
+ rust-web-time-1)
+ #:cargo-development-inputs (list rust-assert-matches2-0.1)))
+ (home-page "https://ruma.dev/")
+ (synopsis "Types for Matrix client-server API endpoints.")
+ (description
+ "This package provides types for the endpoints in the Matrix
+client-server API.")
+ (license license:expat)))
+
(define-public rust-ruma-client-api-0.17
(package
+ (inherit rust-ruma-client-api-0.18)
(name "rust-ruma-client-api")
(version "0.17.4")
(source
@@ -66744,7 +66782,6 @@ (define-public rust-ruma-client-api-0.17
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "11ik20rnm1c1a3cdbqg8dayd7xgh9sai8xa74c4af552iwjkf634"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-assign" ,rust-assign-1)
("rust-bytes" ,rust-bytes-1)
@@ -66758,13 +66795,7 @@ (define-public rust-ruma-client-api-0.17
("rust-serde-html-form" ,rust-serde-html-form-0.2)
("rust-serde-json" ,rust-serde-json-1))
#:cargo-development-inputs
- (("rust-assert-matches2" ,rust-assert-matches2-0.1))))
- (home-page "https://ruma.io/")
- (synopsis "Types for Matrix client-server API endpoints.")
- (description
- "This package provides types for the endpoints in the Matrix
-client-server API.")
- (license license:expat)))
+ (("rust-assert-matches2" ,rust-assert-matches2-0.1))))))
(define-public rust-ruma-common-0.13
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 77/81] gnu: rust-http-body-util-0.1: Update to 0.1.1.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (75 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 76/81] gnu: Add rust-ruma-client-api-0.18 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 78/81] gnu: rust-hyper-1: Update to 1.3.1 Herman Rimm via Guix-patches via
` (3 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-web.scm (rust-http-body-util-0.1): Update to
0.1.1.
Change-Id: I51beb3a4ac653bf1a648fee1e752190dd61c8401
---
gnu/packages/crates-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 19ab376805..0b7056b84d 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -3355,14 +3355,14 @@ (define-public rust-http-body-0.1
(define-public rust-http-body-util-0.1
(package
(name "rust-http-body-util")
- (version "0.1.0")
+ (version "0.1.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "http-body-util" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0h78a6jj2vky0wmgmq5f1h541cmhmlij09gw63fxl59h77mpkjs1"))))
+ (base32 "07agldas2qgcfc05ckiarlmf9vzragbda823nqhrqrc6mjrghx84"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-bytes" ,rust-bytes-1)
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 78/81] gnu: rust-hyper-1: Update to 1.3.1.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (76 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 77/81] gnu: rust-http-body-util-0.1: Update to 0.1.1 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 79/81] gnu: Add rust-ruma-client-0.13 Herman Rimm via Guix-patches via
` (2 subsequent siblings)
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-web.scm (rust-hyper-1): Update to 1.3.1.
Change-Id: I7fae47334ccb94ef1d6929ae90a8cb36a8c0dfca
---
gnu/packages/crates-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 0b7056b84d..a28a3f7847 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -3539,14 +3539,14 @@ (define-public rust-httpdate-1
(define-public rust-hyper-1
(package
(name "rust-hyper")
- (version "1.2.0")
+ (version "1.3.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "hyper" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0fi6k7hz5fmdph0a5r8hw50d7h2n9zxkizmafcmb65f67bblhr8q"))))
+ (base32 "0va9pjqshsr8zc07m9h4j2821hsmd9lw9j416yisjqh8gp8msmzy"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f ; unresolved imports `super::DecodedLength`, `super::Sender`
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 79/81] gnu: Add rust-ruma-client-0.13.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (77 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 78/81] gnu: rust-hyper-1: Update to 1.3.1 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 80/81] gnu: Add rust-ruma-appservice-api-0.10 Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 81/81] gnu: Add rust-ruma-0.10 Herman Rimm via Guix-patches via
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-ruma-client-0.13): Add variable.
(rust-ruma-client-0.12): Inherit from rust-ruma-client-0.13.
Change-Id: Id360f39926a6b2fc63ea829eee60e20b60d8d751
---
gnu/packages/crates-io.scm | 47 +++++++++++++++++++++++++++++++++-----
1 file changed, 41 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 434626af63..a314230194 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -66693,8 +66693,48 @@ (define-public rust-ruma-appservice-api-0.9
application service API.")
(license license:expat)))
+(define-public rust-ruma-client-0.13
+ (package
+ (name "rust-ruma-client")
+ (version "0.13.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "ruma-client" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "01r6zjfz93zj02wcmrdvgfmr5hxkna6xqvbvvs96dq81jczwfb1r"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list ; Skip the doctests.
+ #:cargo-test-flags `(list "--release" "--lib" "--bins" "--tests")
+ #:cargo-inputs (list rust-as-variant-1
+ rust-assign-1
+ rust-async-stream-0.3
+ rust-bytes-1
+ rust-futures-core-0.3
+ rust-http-1
+ rust-http-body-util-0.1
+ rust-hyper-1
+ rust-hyper-rustls-0.27
+ rust-hyper-tls-0.6
+ rust-hyper-util-0.1
+ rust-reqwest-0.12
+ rust-ruma-client-api-0.18
+ rust-ruma-common-0.13
+ rust-serde-html-form-0.2
+ rust-tracing-0.1)
+ #:cargo-development-inputs (list rust-ruma-client-api-0.18
+ rust-tokio-stream-0.1)))
+ (home-page "https://ruma.dev/")
+ (synopsis "Matrix client library")
+ (description "This package provides a Matrix client library.")
+ (license license:expat)))
+
(define-public rust-ruma-client-0.12
(package
+ (inherit rust-ruma-client-0.13)
(name "rust-ruma-client")
(version "0.12.0")
(source
@@ -66704,7 +66744,6 @@ (define-public rust-ruma-client-0.12
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "136dbzns8bs9xwr97gpnrz7cblwhpfrr85mnrclb34gm0snq2p3g"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-test-flags '("--release" "--all-targets")
#:cargo-inputs (("rust-assign" ,rust-assign-1)
@@ -66727,11 +66766,7 @@ (define-public rust-ruma-client-0.12
("rust-tracing" ,rust-tracing-0.1))
#:cargo-development-inputs
(("rust-ruma-client-api" ,rust-ruma-client-api-0.17)
- ("rust-tokio-stream" ,rust-tokio-stream-0.1))))
- (home-page "https://www.ruma.io/")
- (synopsis "Matrix client library")
- (description "This package provides a Matrix client library.")
- (license license:expat)))
+ ("rust-tokio-stream" ,rust-tokio-stream-0.1))))))
(define-public rust-ruma-client-api-0.18
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 80/81] gnu: Add rust-ruma-appservice-api-0.10.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (78 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 79/81] gnu: Add rust-ruma-client-0.13 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
2024-05-20 8:59 ` [bug#71076] [PATCH 81/81] gnu: Add rust-ruma-0.10 Herman Rimm via Guix-patches via
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-ruma-appservice-api-0.10): Add
variable.
(rust-ruma-appservice-api-0.9): Inherit from
rust-ruma-appservice-api-0.10.
Change-Id: Ibd41ccf6c64b5f9d144247dc802f17aeb989f0e2
---
gnu/packages/crates-io.scm | 38 ++++++++++++++++++++++++++++++--------
1 file changed, 30 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a314230194..61988aea49 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -66665,8 +66665,37 @@ (define-public rust-ruma-0.9
protocol.")
(license license:expat)))
+(define-public rust-ruma-appservice-api-0.10
+ (package
+ (name "rust-ruma-appservice-api")
+ (version "0.10.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "ruma-appservice-api" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0sqhd5a2w0ry8s9jkd62iicsg7xfj38yaclvm5zs5ynnf5s7zpnf"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-js-int-0.2
+ rust-ruma-common-0.13
+ rust-ruma-events-0.28
+ rust-serde-1
+ rust-serde-json-1)
+ #:cargo-development-inputs (list rust-assert-matches2-0.1
+ rust-serde-yaml-0.9)))
+ (home-page "https://ruma.dev/")
+ (synopsis "Types for Matrix application service API endpoints")
+ (description
+ "This package provides types for the endpoints in the Matrix
+application service API.")
+ (license license:expat)))
+
(define-public rust-ruma-appservice-api-0.9
(package
+ (inherit rust-ruma-appservice-api-0.10)
(name "rust-ruma-appservice-api")
(version "0.9.0")
(source
@@ -66676,7 +66705,6 @@ (define-public rust-ruma-appservice-api-0.9
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1xabivmgklm7qav1ja84b92pq7fxy4h344zhk25bhgbb4j3zi3y2"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-js-int" ,rust-js-int-0.2)
("rust-ruma-common" ,rust-ruma-common-0.12)
@@ -66685,13 +66713,7 @@ (define-public rust-ruma-appservice-api-0.9
("rust-serde-json" ,rust-serde-json-1))
#:cargo-development-inputs
(("rust-assert-matches2" ,rust-assert-matches2-0.1)
- ("rust-serde-yaml" ,rust-serde-yaml-0.9))))
- (home-page "https://www.ruma.io/")
- (synopsis "Types for Matrix application service API endpoints")
- (description
- "This package provides types for the endpoints in the Matrix
-application service API.")
- (license license:expat)))
+ ("rust-serde-yaml" ,rust-serde-yaml-0.9))))))
(define-public rust-ruma-client-0.13
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [bug#71076] [PATCH 81/81] gnu: Add rust-ruma-0.10.
2024-05-20 8:55 [bug#71076] [PATCH 00/81] Add matrix-conduit and ruma-0.10 Herman Rimm via Guix-patches via
` (79 preceding siblings ...)
2024-05-20 8:59 ` [bug#71076] [PATCH 80/81] gnu: Add rust-ruma-appservice-api-0.10 Herman Rimm via Guix-patches via
@ 2024-05-20 8:59 ` Herman Rimm via Guix-patches via
80 siblings, 0 replies; 82+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-05-20 8:59 UTC (permalink / raw)
To: 71076; +Cc: Efraim Flashner
* gnu/packages/crates-io.scm (rust-ruma-0.10): Add variable.
(rust-ruma-0.9): Inherit from rust-ruma-0.10.
Change-Id: I699ee53df8fe61f86bd31284832f696df8a81d34
---
gnu/packages/crates-io.scm | 48 +++++++++++++++++++++++++++++++-------
1 file changed, 40 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 61988aea49..027e740032 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -66627,8 +66627,47 @@ (define-public rust-rug-1
floating-point, and complex numbers based on GMP, MPFR and MPC.")
(license license:lgpl3+)))
+(define-public rust-ruma-0.10
+ (package
+ (name "rust-ruma")
+ (version "0.10.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "ruma" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "088ma0x059wx39wdjslxjgxnzdw3qx1dpsl1dvpr4j58ghz5nm9s"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs (list rust-assign-1
+ rust-js-int-0.2
+ rust-js-option-0.1
+ rust-ruma-appservice-api-0.10
+ rust-ruma-client-0.13
+ rust-ruma-client-api-0.18
+ rust-ruma-common-0.13
+ rust-ruma-events-0.28
+ rust-ruma-federation-api-0.9
+ rust-ruma-html-0.2
+ rust-ruma-identity-service-api-0.9
+ rust-ruma-push-gateway-api-0.9
+ rust-ruma-server-util-0.3
+ rust-ruma-signatures-0.15
+ rust-ruma-state-res-0.11
+ rust-web-time-1)
+ #:cargo-development-inputs (list rust-serde-1)))
+ (home-page "https://ruma.dev/")
+ (synopsis "Types and traits for working with the Matrix protocol")
+ (description
+ "This package provides types and traits for working with the Matrix
+protocol.")
+ (license license:expat)))
+
(define-public rust-ruma-0.9
(package
+ (inherit rust-ruma-0.10)
(name "rust-ruma")
(version "0.9.4")
(source
@@ -66638,7 +66677,6 @@ (define-public rust-ruma-0.9
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0dksah6cwdini5ln930plz8x01zv1qqdjnb28xilr5kjy26w6y97"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-assign" ,rust-assign-1)
@@ -66657,13 +66695,7 @@ (define-public rust-ruma-0.9
("rust-ruma-server-util" ,rust-ruma-server-util-0.2)
("rust-ruma-signatures" ,rust-ruma-signatures-0.14)
("rust-ruma-state-res" ,rust-ruma-state-res-0.10))
- #:cargo-development-inputs (("rust-serde" ,rust-serde-1))))
- (home-page "https://ruma.io/")
- (synopsis "Types and traits for working with the Matrix protocol")
- (description
- "This package provides types and traits for working with the Matrix
-protocol.")
- (license license:expat)))
+ #:cargo-development-inputs (("rust-serde" ,rust-serde-1))))))
(define-public rust-ruma-appservice-api-0.10
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 82+ messages in thread