diff --git a/Cargo.lock b/Cargo.lock index 2a5bab8e..d2ad3332 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -170,7 +170,7 @@ dependencies = [ "url", "xz2", "zip", - "zstd", + "zstd 0.12.0+zstd.1.5.2", ] [[package]] @@ -2781,7 +2781,7 @@ dependencies = [ "crc32fast", "crossbeam-utils", "flate2", - "zstd", + "zstd 0.11.2+zstd.1.5.2", ] [[package]] @@ -2790,7 +2790,16 @@ version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ - "zstd-safe", + "zstd-safe 5.0.2+zstd.1.5.2", +] + +[[package]] +name = "zstd" +version = "0.12.0+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8148aa921e9d53217ab9322f8553bd130f7ae33489db68b381d76137d2e6374" +dependencies = [ + "zstd-safe 6.0.2+zstd.1.5.2", ] [[package]] @@ -2803,6 +2812,16 @@ dependencies = [ "zstd-sys", ] +[[package]] +name = "zstd-safe" +version = "6.0.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6cf39f730b440bab43da8fb5faf5f254574462f73f260f85f7987f32154ff17" +dependencies = [ + "libc", + "zstd-sys", +] + [[package]] name = "zstd-sys" version = "2.0.1+zstd.1.5.2" diff --git a/crates/binstalk-downloader/Cargo.toml b/crates/binstalk-downloader/Cargo.toml index a6d0f28f..36d33615 100644 --- a/crates/binstalk-downloader/Cargo.toml +++ b/crates/binstalk-downloader/Cargo.toml @@ -44,9 +44,10 @@ xz2 = "0.1.7" zip = { version = "0.6.3", default-features = false, features = ["deflate", "bzip2", "zstd"] } # zstd is also depended by zip. -# Since zip 0.6.3 depends on zstd 0.11, we also have to use 0.11 here, -# otherwise there will be a link conflict. -zstd = { version = "0.11.2", default-features = false } +# Since zip 0.6.3 depends on zstd 0.11, we can use 0.12.0 here +# because it uses the same zstd-sys version. +# Otherwise there will be a link conflict. +zstd = { version = "0.12.0", default-features = false } [features] default = ["static", "rustls"]