From afc102537ab2384801429829fe2654fe226a73aa Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Mar 2024 09:17:03 +0200 Subject: [PATCH] gnu: rust-zstd-sys-2: Unbundle zstd. * gnu/packages/crates-io.scm (rust-zstd-sys-2)[source]: Add snippet to remove bundled zstd. [native-inputs]: Add pkg-config. [inputs]: Add zstd:lib. (rust-parquet2-0.17, rust-polars-io-0.37, rust-polars-pipe-0.37, rust-zip-0.6, rust-zstd-0.13, rust-zstd-safe-7)[native-inputs]: Add pkg-config. [inputs]: Add zstd:lib. * gnu/packages/crates-web.scm (rust-tower-http-0.5)[native-inputs]: Add pkg-config. [inputs]: Add zstd:lib. * gnu/packages/python-compression.scm (python-cramjam) [native-inputs]: Add pkg-config. [inputs]: Add zstd:lib. Change-Id: Iccb160aa7099c141567c415237ab9662448a4e93 --- gnu/packages/crates-io.scm | 40 ++++++++++++++++++++++++----- gnu/packages/crates-web.scm | 2 ++ gnu/packages/python-compression.scm | 2 ++ 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 785c4959b5..31e1c64c7e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -49319,6 +49319,8 @@ (define-public rust-parquet2-0.17 #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.4) ("rust-rand" ,rust-rand-0.8) ("rust-tokio" ,rust-tokio-1)))) + (native-inputs (list pkg-config)) + (inputs (list (list zstd "lib"))) (home-page "https://github.com/jorgecarleitao/parquet2") (synopsis "Safe implementation of Parquet IO") (description @@ -49350,7 +49352,9 @@ (define-public rust-parquet2-0.6 ("rust-parquet-format-async-temp" ,rust-parquet-format-async-temp-0.2) ("rust-snap" ,rust-snap-1) ("rust-streaming-decompression" ,rust-streaming-decompression-0.1) - ("rust-zstd" ,rust-zstd-0.9)))))) + ("rust-zstd" ,rust-zstd-0.9)))) + (native-inputs '()) + (inputs '()))) (define-public rust-parse-display-0.8 (package @@ -52486,6 +52490,8 @@ (define-public rust-polars-io-0.37 ("rust-url" ,rust-url-2) ("rust-zstd" ,rust-zstd-0.13)) #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs (list pkg-config)) + (inputs (list (list zstd "lib"))) (home-page "https://www.pola.rs/") (synopsis "IO related logic for the Polars DataFrame library") (description @@ -52523,7 +52529,9 @@ (define-public rust-polars-io-0.17 ("rust-polars-core" ,rust-polars-core-0.17) ("rust-rayon" ,rust-rayon-1) ("rust-regex" ,rust-regex-1) - ("rust-simdutf8" ,rust-simdutf8-0.1)))))) + ("rust-simdutf8" ,rust-simdutf8-0.1)))) + (native-inputs '()) + (inputs '()))) (define-public rust-polars-json-0.37 (package @@ -52750,6 +52758,8 @@ (define-public rust-polars-pipe-0.37 ("rust-smartstring" ,rust-smartstring-1) ("rust-tokio" ,rust-tokio-1) ("rust-version-check" ,rust-version-check-0.9)))) + (native-inputs (list pkg-config)) + (inputs (list (list zstd "lib"))) (home-page "https://www.pola.rs/") (synopsis "Lazy query engine for the Polars DataFrame library") (description "Lazy query engine for the Polars @code{DataFrame} library.") @@ -87646,6 +87656,8 @@ (define-public rust-zip-0.6 ("rust-getrandom" ,rust-getrandom-0.2) ("rust-time" ,rust-time-0.3) ("rust-walkdir" ,rust-walkdir-2)))) + (native-inputs (list pkg-config)) + (inputs (list (list zstd "lib"))) (home-page "https://github.com/zip-rs/zip") (synopsis "Library to support the reading and writing of zip files") @@ -87675,7 +87687,9 @@ (define-public rust-zip-0.5 ("rust-crc32fast" ,rust-crc32fast-1) ("rust-flate2" ,rust-flate2-1) ("rust-thiserror" ,rust-thiserror-1) - ("rust-time" ,rust-time-0.1)))))) + ("rust-time" ,rust-time-0.1)))) + (native-inputs '()) + (inputs '()))) (define-public rust-zoneinfo-compiled-0.5 (package @@ -87720,6 +87734,8 @@ (define-public rust-zstd-0.13 ("rust-humansize" ,rust-humansize-2) ("rust-partial-io" ,rust-partial-io-0.5) ("rust-walkdir" ,rust-walkdir-2)))) + (native-inputs (list pkg-config)) + (inputs (list (list zstd "lib"))) (home-page "https://github.com/gyscos/zstd-rs") (synopsis "Binding to the zstd compression library") (description @@ -87796,7 +87812,9 @@ (define-public rust-zstd-0.9 (("rust-clap" ,rust-clap-3) ("rust-humansize" ,rust-humansize-1) ("rust-partial-io" ,rust-partial-io-0.5) - ("rust-walkdir" ,rust-walkdir-2)))))) + ("rust-walkdir" ,rust-walkdir-2)))) + (native-inputs '()) + (inputs '()))) (define-public rust-zstd-safe-7 (package @@ -87812,6 +87830,8 @@ (define-public rust-zstd-safe-7 (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-zstd-sys" ,rust-zstd-sys-2)))) + (native-inputs (list pkg-config)) + (inputs (list (list zstd "lib"))) (home-page "https://github.com/gyscos/zstd-rs") (synopsis "Safe low-level bindings to the zstd compression library") (description @@ -87868,9 +87888,10 @@ (define-public rust-zstd-safe-4 (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) - ("rust-zstd-sys" ,rust-zstd-sys-1)))))) + ("rust-zstd-sys" ,rust-zstd-sys-1)))) + (native-inputs '()) + (inputs '()))) -;; TODO: Unbundle zstd. (define-public rust-zstd-sys-2 (package (name "rust-zstd-sys") @@ -87881,12 +87902,17 @@ (define-public rust-zstd-sys-2 (uri (crate-uri "zstd-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ak51pq1ni6q3qgyr58iq1pcz0vyh80f8vn8m27zrfpm9a8s8ly2")))) + (base32 "1ak51pq1ni6q3qgyr58iq1pcz0vyh80f8vn8m27zrfpm9a8s8ly2")) + (snippet #~(begin + (use-modules (guix build utils)) + (delete-file-recursively "zstd"))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.69) ("rust-cc" ,rust-cc-1) ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (native-inputs (list pkg-config)) + (inputs (list (list zstd "lib"))) (home-page "https://github.com/gyscos/zstd-rs") (synopsis "Low-level bindings to the zstd compression library") (description "This package provides low-level Rust bindings to the zstd diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm index 2e446461c4..7838b1f080 100644 --- a/gnu/packages/crates-web.scm +++ b/gnu/packages/crates-web.scm @@ -5513,6 +5513,8 @@ (define-public rust-tower-http-0.5 ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3) ("rust-uuid" ,rust-uuid-1) ("rust-zstd" ,rust-zstd-0.12)))) + (native-inputs (list pkg-config)) + (inputs (list (list zstd "lib"))) (home-page "https://github.com/tower-rs/tower-http") (synopsis "Tower middleware and utilities for HTTP clients and servers") (description diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 96e607bfe9..cfabc618d2 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -173,11 +173,13 @@ (define-public python-cramjam ("rust-zstd" ,rust-zstd-0.11)) #:install-source? #f)) (native-inputs (list maturin + pkg-config python-pytest python-pytest-xdist python-numpy python-hypothesis python-wrapper)) + (inputs (list `(,zstd "lib"))) (home-page "https://github.com/milesgranger/cramjam") (synopsis "Python bindings to compression algorithms in Rust") (description