From f02ea1d9a48cd8e11c9417c38dada03793cd8e89 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 21 Jan 2024 20:14:14 +0200 Subject: [PATCH] gnu: rust-x509-parser: Move to (gnu packages crates-tls). * gnu/packages/crates-io.scm (rust-x509-parser-0.15, rust-x509-parser-0.14, rust-x509-parser-0.12): Move from here ... * gnu/packages/crates-tls.scm: ... to here. Change-Id: If01b17cf9b418e15616f1b80cefe6b071c8a18b0 --- gnu/packages/crates-apple.scm | 3 +- gnu/packages/crates-io.scm | 83 ----------------------------------- gnu/packages/crates-tls.scm | 83 +++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 84 deletions(-) diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm index 806d0adc53..df1f2add34 100644 --- a/gnu/packages/crates-apple.scm +++ b/gnu/packages/crates-apple.scm @@ -36,7 +36,8 @@ (define-module (gnu packages crates-apple) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages crates-graphics) - #:use-module (gnu packages crates-io)) + #:use-module (gnu packages crates-io) + #:use-module (gnu packages crates-tls)) (define-public rust-block-0.1 (package diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9c4ec7640b..370b87ea9e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -79135,89 +79135,6 @@ (define-public rust-wyz-0.2 "This package provides a collection of utility functions.") (license license:expat))) -(define-public rust-x509-parser-0.15 - (package - (name "rust-x509-parser") - (version "0.15.0") - (source (origin - (method url-fetch) - (uri (crate-uri "x509-parser" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0d7nshccpnybbh8mypirplf4bqxiy36bgh4rrd7jzng19bsw5c5s")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-asn1-rs" ,rust-asn1-rs-0.5) - ("rust-data-encoding" ,rust-data-encoding-2) - ("rust-der-parser" ,rust-der-parser-8) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-nom" ,rust-nom-7) - ("rust-oid-registry" ,rust-oid-registry-0.6) - ("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)))) - -(define-public rust-x509-parser-0.14 - (package - (inherit rust-x509-parser-0.15) - (name "rust-x509-parser") - (version "0.14.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "x509-parser" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1j7b3xxpwik38y9rajglmhis551gj3zz5irw1vj1bqkwnsvvxv70")))) - (arguments - `(#:cargo-inputs (("rust-asn1-rs" ,rust-asn1-rs-0.5) - ("rust-base64" ,rust-base64-0.13) - ("rust-data-encoding" ,rust-data-encoding-2) - ("rust-der-parser" ,rust-der-parser-8) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-nom" ,rust-nom-7) - ("rust-oid-registry" ,rust-oid-registry-0.6) - ("rust-ring" ,rust-ring-0.16) - ("rust-rusticata-macros" ,rust-rusticata-macros-4) - ("rust-thiserror" ,rust-thiserror-1) - ("rust-time" ,rust-time-0.3)))))) - -(define-public rust-x509-parser-0.12 - (package - (inherit rust-x509-parser-0.15) - (name "rust-x509-parser") - (version "0.12.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "x509-parser" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1vanwazknxwd1kmlp443bpph9qyas021ayqk6iljxdscm0v0ijgz")))) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-base64" ,rust-base64-0.13) - ("rust-chrono" ,rust-chrono-0.4) - ("rust-data-encoding" ,rust-data-encoding-2) - ("rust-der-parser" ,rust-der-parser-6) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-nom" ,rust-nom-7) - ("rust-oid-registry" ,rust-oid-registry-0.2) - ("rust-ring" ,rust-ring-0.16) - ("rust-rusticata-macros" ,rust-rusticata-macros-4) - ("rust-thiserror" ,rust-thiserror-1)))))) - (define-public rust-x86-0.52 (package (name "rust-x86") diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm index 99dbf8e013..509c407dd8 100644 --- a/gnu/packages/crates-tls.scm +++ b/gnu/packages/crates-tls.scm @@ -739,3 +739,86 @@ (define-public rust-tls-parser-0.11 (synopsis "Parser for the TLS protocol") (description "This package provides a Rust parser for the TLS protocol.") (license (list license:expat license:asl2.0)))) + +(define-public rust-x509-parser-0.15 + (package + (name "rust-x509-parser") + (version "0.15.0") + (source (origin + (method url-fetch) + (uri (crate-uri "x509-parser" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0d7nshccpnybbh8mypirplf4bqxiy36bgh4rrd7jzng19bsw5c5s")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-asn1-rs" ,rust-asn1-rs-0.5) + ("rust-data-encoding" ,rust-data-encoding-2) + ("rust-der-parser" ,rust-der-parser-8) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-nom" ,rust-nom-7) + ("rust-oid-registry" ,rust-oid-registry-0.6) + ("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)))) + +(define-public rust-x509-parser-0.14 + (package + (inherit rust-x509-parser-0.15) + (name "rust-x509-parser") + (version "0.14.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "x509-parser" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1j7b3xxpwik38y9rajglmhis551gj3zz5irw1vj1bqkwnsvvxv70")))) + (arguments + `(#:cargo-inputs (("rust-asn1-rs" ,rust-asn1-rs-0.5) + ("rust-base64" ,rust-base64-0.13) + ("rust-data-encoding" ,rust-data-encoding-2) + ("rust-der-parser" ,rust-der-parser-8) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-nom" ,rust-nom-7) + ("rust-oid-registry" ,rust-oid-registry-0.6) + ("rust-ring" ,rust-ring-0.16) + ("rust-rusticata-macros" ,rust-rusticata-macros-4) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-time" ,rust-time-0.3)))))) + +(define-public rust-x509-parser-0.12 + (package + (inherit rust-x509-parser-0.15) + (name "rust-x509-parser") + (version "0.12.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "x509-parser" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vanwazknxwd1kmlp443bpph9qyas021ayqk6iljxdscm0v0ijgz")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-base64" ,rust-base64-0.13) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-data-encoding" ,rust-data-encoding-2) + ("rust-der-parser" ,rust-der-parser-6) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-nom" ,rust-nom-7) + ("rust-oid-registry" ,rust-oid-registry-0.2) + ("rust-ring" ,rust-ring-0.16) + ("rust-rusticata-macros" ,rust-rusticata-macros-4) + ("rust-thiserror" ,rust-thiserror-1))))))