From cf0af0603193d9454119792620f63a930b54d190 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 4 Jan 2024 20:35:15 +0200 Subject: [PATCH] gnu: rust-security-framework: Move to (gnu packages crates-apple). * gnu/packages/crates-io.scm (rust-security-framework-2, rust-security-framework-1, rust-security-framework-0.3, rust-security-framework-0.2, rust-security-framework-0.1, rust-security-framework-sys-2, rust-security-framework-sys-1, rust-security-framework-sys-0.3, rust-security-framework-sys-0.2, rust-security-framework-sys-0.1): Move from here ... * gnu/packages/crates-apple.scm: ... to here. Change-Id: Ic3fed59019265d19f8c0efa992566691a6a807f6 --- gnu/packages/crates-apple.scm | 233 ++++++++++++++++++++++++++++++++++ gnu/packages/crates-io.scm | 233 ---------------------------------- gnu/packages/crates-tls.scm | 1 + 3 files changed, 234 insertions(+), 233 deletions(-) diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm index f3965a0928..03de10a853 100644 --- a/gnu/packages/crates-apple.scm +++ b/gnu/packages/crates-apple.scm @@ -681,3 +681,236 @@ (define-public rust-readkey-0.1 "This package provides a very small library for finding out if a key is currently pressed on macOS.") (license license:expat))) + +(define-public rust-security-framework-2 + (package + (name "rust-security-framework") + (version "2.9.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "security-framework" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1pplxk15s5yxvi2m1sz5xfmjibp96cscdcl432w9jzbk0frlzdh5")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ;missing files + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-core-foundation" ,rust-core-foundation-0.9) + ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-num-bigint" ,rust-num-bigint-0.4) + ("rust-security-framework-sys" ,rust-security-framework-sys-2)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.10) + ("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)))) + (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 +macOS and iOS.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-security-framework-1 + (package + (inherit rust-security-framework-2) + (name "rust-security-framework") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "security-framework" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0axwlax65j1f79rsm4ylc8rc6p2knbi3dgnpbdq7a1bzh5k2hl5d")))) + (arguments + `(#:tests? #f ; Not all files included + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-core-foundation" ,rust-core-foundation-0.7) + ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.7) + ("rust-libc" ,rust-libc-0.2) + ("rust-security-framework-sys" ,rust-security-framework-sys-1)) + #:cargo-development-inputs + (("rust-hex" ,rust-hex-0.4) + ("rust-tempdir" ,rust-tempdir-0.3)))))) + +(define-public rust-security-framework-0.3 + (package + (inherit rust-security-framework-1) + (name "rust-security-framework") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "security-framework" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1pqn79cl9njnnhsmjvvphkzx8is5jhfd8bhxpllgvrgggjfl5wlf")))) + (arguments + `(#:tests? #f ; Some test files not included in release. + #:cargo-inputs + (("rust-core-foundation" ,rust-core-foundation-0.6) + ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6) + ("rust-libc" ,rust-libc-0.2) + ("rust-security-framework-sys" ,rust-security-framework-sys-0.3)) + #:cargo-development-inputs + (("rust-hex" ,rust-hex-0.4) + ("rust-tempdir" ,rust-tempdir-0.3)))))) + +(define-public rust-security-framework-0.2 + (package + (inherit rust-security-framework-0.3) + (name "rust-security-framework") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "security-framework" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0gw3xxg8yzbjb4ny5cy07gky177c1nbgpxqjsw3hfzpfgrxji9bz")))) + (arguments + `(#:skip-build? #t ; MacOS specific + #:cargo-inputs + (("rust-core-foundation" + ,rust-core-foundation-0.6) + ("rust-core-foundation-sys" + ,rust-core-foundation-sys-0.6) + ("rust-libc" ,rust-libc-0.2) + ("rust-security-framework-sys" + ,rust-security-framework-sys-0.2)) + #:cargo-development-inputs + (("rust-hex" ,rust-hex-0.3) + ("rust-tempdir" ,rust-tempdir-0.3)))))) + +(define-public rust-security-framework-0.1 + (package + (inherit rust-security-framework-0.2) + (name "rust-security-framework") + (version "0.1.16") + (source + (origin + (method url-fetch) + (uri (crate-uri "security-framework" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ci39ax08h2ngrl1yf1ra9smivhjs6xarmg7kp6fxracqpllx96z")))) + (arguments + `(#:skip-build? #t ; MacOS specific + #:cargo-inputs + (("rust-core-foundation" ,rust-core-foundation-0.2) + ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-security-framework-sys" ,rust-security-framework-sys-0.1)) + #:cargo-development-inputs + (("rust-hex" ,rust-hex-0.2) + ("rust-tempdir" ,rust-tempdir-0.3)))))) + +(define-public rust-security-framework-sys-2 + (package + (name "rust-security-framework-sys") + (version "2.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "security-framework-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0yhciwlsy9dh0ps1gw3197kvyqx1bvc4knrhiznhid6kax196cp9")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8) + ("rust-libc" ,rust-libc-0.2)))) + (home-page "https://lib.rs/crates/security-framework-sys") + (synopsis "Low-level FFI bindings to Apple @code{Security.framework}") + (description "This package provides low level FFI bindings to Apple +@code{Security.framework}.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-security-framework-sys-1 + (package + (inherit rust-security-framework-sys-2) + (name "rust-security-framework-sys") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "security-framework-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1iynsjz53lqkkw4zbq8l99xn799chbx90lsmrlfnsyxii14v1kji")))) + (arguments + `(#:cargo-inputs + (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.7) + ("rust-libc" ,rust-libc-0.2)))))) + +(define-public rust-security-framework-sys-0.3 + (package + (inherit rust-security-framework-sys-1) + (name "rust-security-framework-sys") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "security-framework-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "15gqhhi206lzynd0pcbswxhvqc4p9bmpl2h9qnwfnpb16zy96573")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6)))))) + +(define-public rust-security-framework-sys-0.2 + (package + (inherit rust-security-framework-sys-0.3) + (name "rust-security-framework-sys") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "security-framework-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "07zv0szz2kfy1hn251h0qsq0q9i1zia768d8vzril1g6xarj7mcj")))) + (arguments + `(#:skip-build? #t ; MacOS specific + #:cargo-inputs + (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6) + ("rust-libc" ,rust-libc-0.2)))))) + +(define-public rust-security-framework-sys-0.1 + (package + (inherit rust-security-framework-sys-0.2) + (name "rust-security-framework-sys") + (version "0.1.16") + (source + (origin + (method url-fetch) + (uri (crate-uri "security-framework-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1bdy87gvmahiiyfzghsdg2dkhznww3p3d3r676qs0y32hcg648al")))) + (arguments + `(#:skip-build? #t ; MacOS specific + #:cargo-inputs + (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.2) + ("rust-libc" ,rust-libc-0.2)))))) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0750b19784..f0cecfc039 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -63124,239 +63124,6 @@ (define-public rust-secp256k1-sys-0.4 @code{libsecp256k1} library.") (license license:cc0))) -(define-public rust-security-framework-2 - (package - (name "rust-security-framework") - (version "2.9.2") - (source - (origin - (method url-fetch) - (uri (crate-uri "security-framework" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1pplxk15s5yxvi2m1sz5xfmjibp96cscdcl432w9jzbk0frlzdh5")))) - (build-system cargo-build-system) - (arguments - `(#:tests? #f ;missing files - #:cargo-inputs - (("rust-bitflags" ,rust-bitflags-1) - ("rust-core-foundation" ,rust-core-foundation-0.9) - ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8) - ("rust-libc" ,rust-libc-0.2) - ("rust-log" ,rust-log-0.4) - ("rust-num-bigint" ,rust-num-bigint-0.4) - ("rust-security-framework-sys" ,rust-security-framework-sys-2)) - #:cargo-development-inputs - (("rust-env-logger" ,rust-env-logger-0.10) - ("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)))) - (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 -macOS and iOS.") - (license (list license:expat license:asl2.0)))) - -(define-public rust-security-framework-1 - (package - (inherit rust-security-framework-2) - (name "rust-security-framework") - (version "1.0.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "security-framework" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0axwlax65j1f79rsm4ylc8rc6p2knbi3dgnpbdq7a1bzh5k2hl5d")))) - (arguments - `(#:tests? #f ; Not all files included - #:cargo-inputs - (("rust-bitflags" ,rust-bitflags-1) - ("rust-core-foundation" ,rust-core-foundation-0.7) - ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.7) - ("rust-libc" ,rust-libc-0.2) - ("rust-security-framework-sys" ,rust-security-framework-sys-1)) - #:cargo-development-inputs - (("rust-hex" ,rust-hex-0.4) - ("rust-tempdir" ,rust-tempdir-0.3)))))) - -(define-public rust-security-framework-0.3 - (package - (inherit rust-security-framework-1) - (name "rust-security-framework") - (version "0.3.4") - (source - (origin - (method url-fetch) - (uri (crate-uri "security-framework" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1pqn79cl9njnnhsmjvvphkzx8is5jhfd8bhxpllgvrgggjfl5wlf")))) - (arguments - `(#:tests? #f ; Some test files not included in release. - #:cargo-inputs - (("rust-core-foundation" ,rust-core-foundation-0.6) - ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6) - ("rust-libc" ,rust-libc-0.2) - ("rust-security-framework-sys" ,rust-security-framework-sys-0.3)) - #:cargo-development-inputs - (("rust-hex" ,rust-hex-0.4) - ("rust-tempdir" ,rust-tempdir-0.3)))))) - -(define-public rust-security-framework-0.2 - (package - (inherit rust-security-framework-0.3) - (name "rust-security-framework") - (version "0.2.4") - (source - (origin - (method url-fetch) - (uri (crate-uri "security-framework" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0gw3xxg8yzbjb4ny5cy07gky177c1nbgpxqjsw3hfzpfgrxji9bz")))) - (arguments - `(#:skip-build? #t ; MacOS specific - #:cargo-inputs - (("rust-core-foundation" - ,rust-core-foundation-0.6) - ("rust-core-foundation-sys" - ,rust-core-foundation-sys-0.6) - ("rust-libc" ,rust-libc-0.2) - ("rust-security-framework-sys" - ,rust-security-framework-sys-0.2)) - #:cargo-development-inputs - (("rust-hex" ,rust-hex-0.3) - ("rust-tempdir" ,rust-tempdir-0.3)))))) - -(define-public rust-security-framework-0.1 - (package - (inherit rust-security-framework-0.2) - (name "rust-security-framework") - (version "0.1.16") - (source - (origin - (method url-fetch) - (uri (crate-uri "security-framework" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0ci39ax08h2ngrl1yf1ra9smivhjs6xarmg7kp6fxracqpllx96z")))) - (arguments - `(#:skip-build? #t ; MacOS specific - #:cargo-inputs - (("rust-core-foundation" ,rust-core-foundation-0.2) - ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.2) - ("rust-libc" ,rust-libc-0.2) - ("rust-security-framework-sys" ,rust-security-framework-sys-0.1)) - #:cargo-development-inputs - (("rust-hex" ,rust-hex-0.2) - ("rust-tempdir" ,rust-tempdir-0.3)))))) - -(define-public rust-security-framework-sys-2 - (package - (name "rust-security-framework-sys") - (version "2.9.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "security-framework-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "0yhciwlsy9dh0ps1gw3197kvyqx1bvc4knrhiznhid6kax196cp9")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8) - ("rust-libc" ,rust-libc-0.2)))) - (home-page "https://lib.rs/crates/security-framework-sys") - (synopsis "Low-level FFI bindings to Apple @code{Security.framework}") - (description "This package provides low level FFI bindings to Apple -@code{Security.framework}.") - (license (list license:expat license:asl2.0)))) - -(define-public rust-security-framework-sys-1 - (package - (inherit rust-security-framework-sys-2) - (name "rust-security-framework-sys") - (version "1.0.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "security-framework-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1iynsjz53lqkkw4zbq8l99xn799chbx90lsmrlfnsyxii14v1kji")))) - (arguments - `(#:cargo-inputs - (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.7) - ("rust-libc" ,rust-libc-0.2)))))) - -(define-public rust-security-framework-sys-0.3 - (package - (inherit rust-security-framework-sys-1) - (name "rust-security-framework-sys") - (version "0.3.3") - (source - (origin - (method url-fetch) - (uri (crate-uri "security-framework-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "15gqhhi206lzynd0pcbswxhvqc4p9bmpl2h9qnwfnpb16zy96573")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6)))))) - -(define-public rust-security-framework-sys-0.2 - (package - (inherit rust-security-framework-sys-0.3) - (name "rust-security-framework-sys") - (version "0.2.4") - (source - (origin - (method url-fetch) - (uri (crate-uri "security-framework-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "07zv0szz2kfy1hn251h0qsq0q9i1zia768d8vzril1g6xarj7mcj")))) - (arguments - `(#:skip-build? #t ; MacOS specific - #:cargo-inputs - (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6) - ("rust-libc" ,rust-libc-0.2)))))) - -(define-public rust-security-framework-sys-0.1 - (package - (inherit rust-security-framework-sys-0.2) - (name "rust-security-framework-sys") - (version "0.1.16") - (source - (origin - (method url-fetch) - (uri (crate-uri "security-framework-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1bdy87gvmahiiyfzghsdg2dkhznww3p3d3r676qs0y32hcg648al")))) - (arguments - `(#:skip-build? #t ; MacOS specific - #:cargo-inputs - (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.2) - ("rust-libc" ,rust-libc-0.2)))))) - (define-public rust-selectors-0.24 (package (name "rust-selectors") diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm index 30f9084c2c..f227f67723 100644 --- a/gnu/packages/crates-tls.scm +++ b/gnu/packages/crates-tls.scm @@ -31,6 +31,7 @@ (define-module (gnu packages crates-tls) #:use-module (guix gexp) #:use-module (guix utils) #:use-module (gnu packages) + #:use-module (gnu packages crates-apple) #:use-module (gnu packages crates-io) #:use-module (gnu packages crates-web) #:use-module (gnu packages crates-windows)