mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(tvix/nix-compat): bump zstd dependency

Browse source 
Otherwise this causes conflicts when adding a more recent zstd version
to another crate.

Change-Id: I02d1b1a37f18711c0969cb04e761e967fc4655dc
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11100
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2024-03-07 16:37:27 +02:00 committed by clbot
parent 22455cc62c
commit 8f804f5d9c
3 changed files with 30 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tvix/Cargo.lock generated
View file

@ -4021,29 +4021,28 @@ checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
[[package]] [[package]]
name = "zstd" name = "zstd"
version = "0.9.2+zstd.1.5.1" version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2390ea1bf6c038c39674f22d95f0564725fc06034a47129179810b2fc58caa54" checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110"
dependencies = [ dependencies = [
"zstd-safe", "zstd-safe",
] ]
[[package]] [[package]]
name = "zstd-safe" name = "zstd-safe"
version = "4.1.3+zstd.1.5.1" version = "7.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e99d81b99fb3c2c2c794e3fe56c305c63d5173a16a46b5850b07c935ffc7db79" checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e"
dependencies = [ dependencies = [
"libc",
"zstd-sys", "zstd-sys",
] ]
[[package]] [[package]]
name = "zstd-sys" name = "zstd-sys"
version = "1.6.2+zstd.1.5.1" version = "2.0.9+zstd.1.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f" checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656"
dependencies = [ dependencies = [
"cc", "cc",
"libc", "pkg-config",
] ]

45
tvix/Cargo.nix
View file

@ -13320,9 +13320,9 @@ rec {
}; };
"zstd" = rec { "zstd" = rec {
crateName = "zstd"; crateName = "zstd";
version = "0.9.2+zstd.1.5.1"; version = "0.13.0";
edition = "2018"; edition = "2018";
sha256 = "0m5aik2jy2w1g68i4isa0c3gq9a7avq9abgjfjbc6f60yqdym413"; sha256 = "0401q54s9r35x2i7m1kwppgkj79g0pb6xz3xpby7qlkdb44k7yxz";
authors = [ authors = [
"Alexandre Bury <alexandre.bury@gmail.com>" "Alexandre Bury <alexandre.bury@gmail.com>"
]; ];
@ -13338,29 +13338,28 @@ rec {
"arrays" = [ "zstd-safe/arrays" ]; "arrays" = [ "zstd-safe/arrays" ];
"bindgen" = [ "zstd-safe/bindgen" ]; "bindgen" = [ "zstd-safe/bindgen" ];
"debug" = [ "zstd-safe/debug" ]; "debug" = [ "zstd-safe/debug" ];
"default" = [ "legacy" "arrays" ]; "default" = [ "legacy" "arrays" "zdict_builder" ];
"experimental" = [ "zstd-safe/experimental" ]; "experimental" = [ "zstd-safe/experimental" ];
"fat-lto" = [ "zstd-safe/fat-lto" ];
"legacy" = [ "zstd-safe/legacy" ]; "legacy" = [ "zstd-safe/legacy" ];
"no_asm" = [ "zstd-safe/no_asm" ]; "no_asm" = [ "zstd-safe/no_asm" ];
"pkg-config" = [ "zstd-safe/pkg-config" ]; "pkg-config" = [ "zstd-safe/pkg-config" ];
"thin" = [ "zstd-safe/thin" ]; "thin" = [ "zstd-safe/thin" ];
"thin-lto" = [ "zstd-safe/thin-lto" ];
"zdict_builder" = [ "zstd-safe/zdict_builder" ];
"zstdmt" = [ "zstd-safe/zstdmt" ]; "zstdmt" = [ "zstd-safe/zstdmt" ];
}; };
resolvedDefaultFeatures = [ "arrays" "default" "legacy" ]; resolvedDefaultFeatures = [ "arrays" "default" "legacy" "zdict_builder" ];
}; };
"zstd-safe" = rec { "zstd-safe" = rec {
crateName = "zstd-safe"; crateName = "zstd-safe";
version = "4.1.3+zstd.1.5.1"; version = "7.0.0";
edition = "2018"; edition = "2018";
sha256 = "0yfvqzzkbj871f2vaikal5rm2gf60p1mdzp3jk3w5hmkkywq37g9"; sha256 = "0gpav2lcibrpmyslmjkcn3w0w64qif3jjljd2h8lr4p249s7qx23";
authors = [ authors = [
"Alexandre Bury <alexandre.bury@gmail.com>" "Alexandre Bury <alexandre.bury@gmail.com>"
]; ];
dependencies = [ dependencies = [
{
name = "libc";
packageId = "libc";
}
{ {
name = "zstd-sys"; name = "zstd-sys";
packageId = "zstd-sys"; packageId = "zstd-sys";
@ -13370,45 +13369,45 @@ rec {
features = { features = {
"bindgen" = [ "zstd-sys/bindgen" ]; "bindgen" = [ "zstd-sys/bindgen" ];
"debug" = [ "zstd-sys/debug" ]; "debug" = [ "zstd-sys/debug" ];
"default" = [ "legacy" "arrays" ]; "default" = [ "legacy" "arrays" "zdict_builder" ];
"experimental" = [ "zstd-sys/experimental" ]; "experimental" = [ "zstd-sys/experimental" ];
"fat-lto" = [ "zstd-sys/fat-lto" ];
"legacy" = [ "zstd-sys/legacy" ]; "legacy" = [ "zstd-sys/legacy" ];
"no_asm" = [ "zstd-sys/no_asm" ]; "no_asm" = [ "zstd-sys/no_asm" ];
"pkg-config" = [ "zstd-sys/pkg-config" ]; "pkg-config" = [ "zstd-sys/pkg-config" ];
"std" = [ "zstd-sys/std" ]; "std" = [ "zstd-sys/std" ];
"thin" = [ "zstd-sys/thin" ]; "thin" = [ "zstd-sys/thin" ];
"thin-lto" = [ "zstd-sys/thin-lto" ];
"zdict_builder" = [ "zstd-sys/zdict_builder" ];
"zstdmt" = [ "zstd-sys/zstdmt" ]; "zstdmt" = [ "zstd-sys/zstdmt" ];
}; };
resolvedDefaultFeatures = [ "arrays" "legacy" "std" ]; resolvedDefaultFeatures = [ "arrays" "legacy" "std" "zdict_builder" ];
}; };
"zstd-sys" = rec { "zstd-sys" = rec {
crateName = "zstd-sys"; crateName = "zstd-sys";
version = "1.6.2+zstd.1.5.1"; version = "2.0.9+zstd.1.5.5";
edition = "2018"; edition = "2018";
links = "zstd"; links = "zstd";
sha256 = "17xcr0mw8ps9hlc8m0dzj7yd52lb9r9ic9fbpxa4994yilj2zbrd"; sha256 = "0mk6a2367swdi22zg03lcackpnvgq96d7120awd4i83lm2lfy5ly";
authors = [ authors = [
"Alexandre Bury <alexandre.bury@gmail.com>" "Alexandre Bury <alexandre.bury@gmail.com>"
]; ];
dependencies = [
{
name = "libc";
packageId = "libc";
}
];
buildDependencies = [ buildDependencies = [
{ {
name = "cc"; name = "cc";
packageId = "cc"; packageId = "cc";
features = [ "parallel" ]; features = [ "parallel" ];
} }
{
name = "pkg-config";
packageId = "pkg-config";
}
]; ];
features = { features = {
"bindgen" = [ "dep:bindgen" ]; "bindgen" = [ "dep:bindgen" ];
"default" = [ "legacy" ]; "default" = [ "legacy" "zdict_builder" ];
"pkg-config" = [ "dep:pkg-config" ];
}; };
resolvedDefaultFeatures = [ "legacy" "std" ]; resolvedDefaultFeatures = [ "legacy" "std" "zdict_builder" ];
}; };
}; };

2
tvix/nix-compat/Cargo.toml
View file

@ -30,7 +30,7 @@ test-case = "3.3.1"
criterion = { version = "0.5", features = ["html_reports"] } criterion = { version = "0.5", features = ["html_reports"] }
hex-literal = "0.4.1" hex-literal = "0.4.1"
pretty_assertions = "1.4.0" pretty_assertions = "1.4.0"
zstd = "^0.9.0" zstd = "^0.13.0"
[dev-dependencies.test-generator] [dev-dependencies.test-generator]
# This fork of test-generator adds support for cargo workspaces, see # This fork of test-generator adds support for cargo workspaces, see