diff options
| author | Florian Klink <flokli@flokli.de> | 2024-03-07T14·37+0200 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2024-03-09T05·47+0000 |
| commit | 8f804f5d9cdba1cfc96aede1cddde1f9b15e2c43 (patch) | |
| tree | aff38ffdeb7742b13d5f29953c5dc04d1fe4d962 /tvix/Cargo.nix | |
| parent | 22455cc62c7381c5b73afe6cf7794bc3862a6a50 (diff) | |
chore(tvix/nix-compat): bump zstd dependency r/7658
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
Diffstat (limited to 'tvix/Cargo.nix')
| -rw-r--r-- | tvix/Cargo.nix | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix index a144b80bf2..f0e76c85e3 100644 --- a/tvix/Cargo.nix +++ b/tvix/Cargo.nix @@ -13320,9 +13320,9 @@ rec { }; "zstd" = rec { crateName = "zstd"; - version = "0.9.2+zstd.1.5.1"; + version = "0.13.0"; edition = "2018"; - sha256 = "0m5aik2jy2w1g68i4isa0c3gq9a7avq9abgjfjbc6f60yqdym413"; + sha256 = "0401q54s9r35x2i7m1kwppgkj79g0pb6xz3xpby7qlkdb44k7yxz"; authors = [ "Alexandre Bury <alexandre.bury@gmail.com>" ]; @@ -13338,30 +13338,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.0.0"; edition = "2018"; - sha256 = "0yfvqzzkbj871f2vaikal5rm2gf60p1mdzp3jk3w5hmkkywq37g9"; + sha256 = "0gpav2lcibrpmyslmjkcn3w0w64qif3jjljd2h8lr4p249s7qx23"; authors = [ "Alexandre Bury <alexandre.bury@gmail.com>" ]; dependencies = [ { - name = "libc"; - packageId = "libc"; - } - { name = "zstd-sys"; packageId = "zstd-sys"; usesDefaultFeatures = false; @@ -13370,45 +13369,45 @@ 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" ]; "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.9+zstd.1.5.5"; edition = "2018"; links = "zstd"; - sha256 = "17xcr0mw8ps9hlc8m0dzj7yd52lb9r9ic9fbpxa4994yilj2zbrd"; + sha256 = "0mk6a2367swdi22zg03lcackpnvgq96d7120awd4i83lm2lfy5ly"; authors = [ "Alexandre Bury <alexandre.bury@gmail.com>" ]; - 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" ]; }; - resolvedDefaultFeatures = [ "legacy" "std" ]; + resolvedDefaultFeatures = [ "legacy" "std" "zdict_builder" ]; }; }; |