From 47445027595bd2523385076cd49e24c90e56e2c0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 13 Mar 2023 13:24:56 +0200 Subject: [PATCH] gnu: rust-ring-0.16: Remove pregenerated files. * gnu/packages/crates-io.scm (rust-ring-0.16)[source]: Add snippet to remove pregenerated files and add fake .git directory. [native-inputs]: Add perl. [supported-systems]: New field. * gnu/packages/rust-apps.scm (tealdeer)[native-inputs]: Add perl. --- gnu/packages/crates-io.scm | 17 ++++++++++++++++- gnu/packages/rust-apps.scm | 3 ++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 655a3dc1c1..6433fa347e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -81,6 +81,7 @@ (define-module (gnu packages crates-io) #:use-module (gnu packages multiprecision) #:use-module (gnu packages nettle) #:use-module (gnu packages pcre) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) @@ -49089,7 +49090,15 @@ (define-public rust-ring-0.16 (uri (crate-uri "ring" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1z682xp7v38ayq9g9nkbhhfpj6ygralmlx7wdmsfv8rnw99cylrh")))) + (base32 "1z682xp7v38ayq9g9nkbhhfpj6ygralmlx7wdmsfv8rnw99cylrh")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "pregenerated") + ;; Pretend this isn't a relase tarball. + (with-output-to-file ".git" + (lambda _ + (format #t ""))))))) (build-system cargo-build-system) (arguments `(#:tests? #false ;missing file @@ -49105,9 +49114,15 @@ (define-public rust-ring-0.16 #:cargo-development-inputs (("rust-libc" ,rust-libc-0.2) ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))) + (native-inputs + (list perl)) (home-page "https://github.com/briansmith/ring") (synopsis "Safe, fast, small crypto using Rust") (description "This package provided safe, fast, small crypto using Rust.") + ;; For a mostly complete list of supported systems see: + ;; https://github.com/briansmith/ring/blob/main/.github/workflows/ci.yml#L170 + (supported-systems (list "aarch64-linux" "armhf-linux" + "i686-linux" "x86_64-linux")) (license (list license:isc license:openssl)))) (define-public rust-ring-0.14 diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index ffc3247d43..e5efaaa179 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -71,6 +71,7 @@ (define-module (gnu packages rust-apps) #:use-module (gnu packages networking) #:use-module (gnu packages ssh) #:use-module (gnu packages pcre) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python-xyz) @@ -2204,7 +2205,7 @@ (define-public tealdeer ("rust-predicates" ,rust-predicates-2) ("rust-tempfile" ,rust-tempfile-3)))) (native-inputs - (list pkg-config)) + (list perl pkg-config)) (inputs (list openssl)) (home-page "https://github.com/dbrgn/tealdeer/")