From 05110068d960874ddf8d358bbca28585301343a9 Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Wed, 19 Oct 2022 10:09:03 -0600 Subject: [PATCH] Update and/or postpone dependencies for 5.3.0 --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- depends/packages/native_cxxbridge.mk | 4 ++-- qa/zcash/postponed-updates.txt | 3 +++ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 506df5197..53914cba5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -431,9 +431,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f39818dcfc97d45b03953c1292efc4e80954e1583c4aa770bac1383e2310a4" +checksum = "3f83d0ebf42c6eafb8d7c52f7e5f2d3003b89c7aa4fd2b79229209459a849af8" dependencies = [ "cc", "cxxbridge-flags", @@ -443,15 +443,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56a46460b88d1cec95112c8c363f0e2c39afdb237f60583b0b36343bf627ea9c" +checksum = "99d2199b00553eda8012dfec8d3b1c75fce747cf27c169a270b3b99e3448ab78" [[package]] name = "cxxbridge-macro" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747b608fecf06b0d72d440f27acc99288207324b793be2c17991839f3d4995ea" +checksum = "dcb67a6de1f602736dd7eaead0080cf3435df806c61b24b13328db128c58868f" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 389b01848..f19397779 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -67,7 +67,7 @@ zeroize = "1.4.2" # Rust/C++ interop # The version needs to match depends/packages/native_cxxbridge.mk -cxx = { version = "=1.0.78", features = ["c++17"] } +cxx = { version = "=1.0.79", features = ["c++17"] } # Rust threading rayon = "1.5" diff --git a/depends/packages/native_cxxbridge.mk b/depends/packages/native_cxxbridge.mk index d135fbe5c..3fe05a407 100644 --- a/depends/packages/native_cxxbridge.mk +++ b/depends/packages/native_cxxbridge.mk @@ -1,10 +1,10 @@ package=native_cxxbridge # The version needs to match cxx in Cargo.toml -$(package)_version=1.0.78 +$(package)_version=1.0.79 $(package)_download_path=https://github.com/dtolnay/cxx/archive/refs/tags $(package)_file_name=native_cxxbridge-$($(package)_version).tar.gz $(package)_download_file=$($(package)_version).tar.gz -$(package)_sha256_hash=0cf9aa04757dff1bb7a2aa569b9f363392e953532a14ec0cadf7335fe12b2728 +$(package)_sha256_hash=4da400783dee17e9a99dd39a17cd2cc346df311cb8745832e2b4d5173c23dfcd $(package)_build_subdir=gen/cmd $(package)_dependencies=native_rust $(package)_extra_sources=$(package)-$($(package)_version)-vendored.tar.gz diff --git a/qa/zcash/postponed-updates.txt b/qa/zcash/postponed-updates.txt index f58a06b9a..139cdf904 100644 --- a/qa/zcash/postponed-updates.txt +++ b/qa/zcash/postponed-updates.txt @@ -19,14 +19,17 @@ native_ccache 4.6 2022-11-01 native_ccache 4.6.1 2022-11-01 native_ccache 4.6.2 2022-11-01 native_ccache 4.6.3 2022-11-01 +native_ccache 4.7 2022-11-01 # Clang and Rust are currently pinned to LLVM 14 libcxx 15.0.0 2022-11-01 libcxx 15.0.1 2022-11-01 libcxx 15.0.2 2022-11-01 +libcxx 15.0.3 2022-11-01 native_clang 15.0.0 2022-11-01 native_clang 15.0.1 2022-11-01 native_clang 15.0.2 2022-11-01 +native_clang 15.0.3 2022-11-01 # We're never updating to this version bdb 18.1.40 2024-02-01