From bfdef33483a601f7976f2a6b6d2b7e714056bfff Mon Sep 17 00:00:00 2001 From: Oleksandr Knyshuk Date: Sun, 3 Aug 2025 13:59:46 +0200 Subject: [PATCH] chore(turbofetch): update zstd dependency to 0.13 Update the zstd crate from version 0.9.0 to 0.13.0, removing the TODO comment blocking the upgrade. The dependency update also includes related bumps to zstd-safe and zstd-sys crates, along with the addition of pkg-config as a new transitive dependency. Change-Id: I6a6a696459075f5ee56f448e87286b6ec39b26d3 Reviewed-on: https://cl.snix.dev/c/snix/+/30640 Tested-by: besadii Reviewed-by: Florian Klink --- contrib/turbofetch/Cargo.lock | 21 ++++++++----- contrib/turbofetch/Cargo.nix | 57 +++++++++++++++++++++-------------- contrib/turbofetch/Cargo.toml | 3 +- 3 files changed, 48 insertions(+), 33 deletions(-) diff --git a/contrib/turbofetch/Cargo.lock b/contrib/turbofetch/Cargo.lock index d538d57b2..41021c95d 100644 --- a/contrib/turbofetch/Cargo.lock +++ b/contrib/turbofetch/Cargo.lock @@ -820,6 +820,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkg-config" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + [[package]] name = "proc-macro2" version = "1.0.88" @@ -1744,29 +1750,28 @@ checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zstd" -version = "0.9.2+zstd.1.5.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2390ea1bf6c038c39674f22d95f0564725fc06034a47129179810b2fc58caa54" +checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "4.1.3+zstd.1.5.1" +version = "7.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e99d81b99fb3c2c2c794e3fe56c305c63d5173a16a46b5850b07c935ffc7db79" +checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "1.6.2+zstd.1.5.1" +version = "2.0.15+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f" +checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237" dependencies = [ "cc", - "libc", + "pkg-config", ] diff --git a/contrib/turbofetch/Cargo.nix b/contrib/turbofetch/Cargo.nix index 4bcb03583..295ff21a8 100644 --- a/contrib/turbofetch/Cargo.nix +++ b/contrib/turbofetch/Cargo.nix @@ -2446,6 +2446,17 @@ rec { "Josef Brandl " ]; + }; + "pkg-config" = rec { + crateName = "pkg-config"; + version = "0.3.32"; + edition = "2018"; + sha256 = "0k4h3gnzs94sjb2ix6jyksacs52cf1fanpwsmlhjnwrdnp8dppby"; + libName = "pkg_config"; + authors = [ + "Alex Crichton " + ]; + }; "proc-macro2" = rec { crateName = "proc-macro2"; @@ -6350,9 +6361,9 @@ rec { }; "zstd" = rec { crateName = "zstd"; - version = "0.9.2+zstd.1.5.1"; + version = "0.13.3"; edition = "2018"; - sha256 = "0m5aik2jy2w1g68i4isa0c3gq9a7avq9abgjfjbc6f60yqdym413"; + sha256 = "12n0h4w9l526li7jl972rxpyf012jw3nwmji2qbjghv9ll8y67p9"; authors = [ "Alexandre Bury " ]; @@ -6368,30 +6379,29 @@ rec { "arrays" = [ "zstd-safe/arrays" ]; "bindgen" = [ "zstd-safe/bindgen" ]; "debug" = [ "zstd-safe/debug" ]; - "default" = [ "legacy" "arrays" ]; + "default" = [ "legacy" "arrays" "zdict_builder" ]; "experimental" = [ "zstd-safe/experimental" ]; + "fat-lto" = [ "zstd-safe/fat-lto" ]; "legacy" = [ "zstd-safe/legacy" ]; "no_asm" = [ "zstd-safe/no_asm" ]; "pkg-config" = [ "zstd-safe/pkg-config" ]; "thin" = [ "zstd-safe/thin" ]; + "thin-lto" = [ "zstd-safe/thin-lto" ]; + "zdict_builder" = [ "zstd-safe/zdict_builder" ]; "zstdmt" = [ "zstd-safe/zstdmt" ]; }; - resolvedDefaultFeatures = [ "arrays" "default" "legacy" ]; + resolvedDefaultFeatures = [ "arrays" "default" "legacy" "zdict_builder" ]; }; "zstd-safe" = rec { crateName = "zstd-safe"; - version = "4.1.3+zstd.1.5.1"; + version = "7.2.4"; edition = "2018"; - sha256 = "0yfvqzzkbj871f2vaikal5rm2gf60p1mdzp3jk3w5hmkkywq37g9"; + sha256 = "179vxmkzhpz6cq6mfzvgwc99bpgllkr6lwxq7ylh5dmby3aw8jcg"; libName = "zstd_safe"; authors = [ "Alexandre Bury " ]; dependencies = [ - { - name = "libc"; - packageId = "libc"; - } { name = "zstd-sys"; packageId = "zstd-sys"; @@ -6401,46 +6411,47 @@ rec { features = { "bindgen" = [ "zstd-sys/bindgen" ]; "debug" = [ "zstd-sys/debug" ]; - "default" = [ "legacy" "arrays" ]; + "default" = [ "legacy" "arrays" "zdict_builder" ]; "experimental" = [ "zstd-sys/experimental" ]; + "fat-lto" = [ "zstd-sys/fat-lto" ]; "legacy" = [ "zstd-sys/legacy" ]; "no_asm" = [ "zstd-sys/no_asm" ]; "pkg-config" = [ "zstd-sys/pkg-config" ]; + "seekable" = [ "zstd-sys/seekable" ]; "std" = [ "zstd-sys/std" ]; "thin" = [ "zstd-sys/thin" ]; + "thin-lto" = [ "zstd-sys/thin-lto" ]; + "zdict_builder" = [ "zstd-sys/zdict_builder" ]; "zstdmt" = [ "zstd-sys/zstdmt" ]; }; - resolvedDefaultFeatures = [ "arrays" "legacy" "std" ]; + resolvedDefaultFeatures = [ "arrays" "legacy" "std" "zdict_builder" ]; }; "zstd-sys" = rec { crateName = "zstd-sys"; - version = "1.6.2+zstd.1.5.1"; + version = "2.0.15+zstd.1.5.7"; edition = "2018"; links = "zstd"; - sha256 = "17xcr0mw8ps9hlc8m0dzj7yd52lb9r9ic9fbpxa4994yilj2zbrd"; + sha256 = "0dx2l7dyw1p7x7g3p1pfd25ip36hr22hvmgixm6cgl4pvlyii0gb"; libName = "zstd_sys"; authors = [ "Alexandre Bury " ]; - dependencies = [ - { - name = "libc"; - packageId = "libc"; - } - ]; buildDependencies = [ { name = "cc"; packageId = "cc"; features = [ "parallel" ]; } + { + name = "pkg-config"; + packageId = "pkg-config"; + } ]; features = { "bindgen" = [ "dep:bindgen" ]; - "default" = [ "legacy" ]; - "pkg-config" = [ "dep:pkg-config" ]; + "default" = [ "legacy" "zdict_builder" "bindgen" ]; }; - resolvedDefaultFeatures = [ "legacy" "std" ]; + resolvedDefaultFeatures = [ "legacy" "std" "zdict_builder" ]; }; }; diff --git a/contrib/turbofetch/Cargo.toml b/contrib/turbofetch/Cargo.toml index bd57823f2..d728ce1f2 100644 --- a/contrib/turbofetch/Cargo.toml +++ b/contrib/turbofetch/Cargo.toml @@ -28,7 +28,6 @@ serde_json = "1.0.108" serde = { version = "1.0.190", features = ["derive"] } tokio = { version = "1.33.0", features = ["full"] } tower = "0.4.13" -# TODO(edef): zstd = "0.13.0" -zstd = "0.9.0" +zstd = "0.13.0" tracing-subscriber = { version = "0.3.17", features = ["json"] } tracing = "0.1.40"