Skip to content

Commit

Permalink
Merge pull request zcash#6952 from str4d/update-deps-6.0.0
Browse files Browse the repository at this point in the history
Update dependencies for 6.0.0
  • Loading branch information
str4d authored Sep 26, 2024
2 parents bfaaf1c + 31ffb08 commit 7a93b4f
Show file tree
Hide file tree
Showing 13 changed files with 485 additions and 225 deletions.
118 changes: 59 additions & 59 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ authors = [
"Kris Nuttycombe <[email protected]>",
"Greg Pfeil",
"Larry Ruane <[email protected]>",
"Steven Smith <[email protected]>"
"Steven Smith",
]
homepage = "https://github.com/zcash/zcash"
repository = "https://github.com/zcash/zcash"
readme = "README.md"
license = "MIT OR Apache-2.0"
edition = "2018"
rust-version = "1.80"
rust-version = "1.81"

[package.metadata.vet]
store = { path = "./qa/supply-chain" }
Expand Down Expand Up @@ -72,7 +72,7 @@ wagyu-zcash-parameters = "0.2"

# Rust/C++ interop
# The version needs to match depends/packages/native_cxxbridge.mk
cxx = { version = "=1.0.126", features = ["c++17"] }
cxx = { version = "=1.0.128", features = ["c++17"] }

# Rust threading
rayon = "1.5"
Expand Down
4 changes: 2 additions & 2 deletions depends/packages/native_cmake.mk
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package=native_cmake
$(package)_version=3.30.2
$(package)_version=3.30.3
$(package)_download_path=https://github.com/Kitware/CMake/releases/download/v$($(package)_version)
$(package)_file_name=cmake-$($(package)_version).tar.gz
$(package)_sha256_hash=46074c781eccebc433e98f0bbfa265ca3fd4381f245ca3b140e7711531d60db2
$(package)_sha256_hash=6d5de15b6715091df7f5441007425264bdd477809f80333fdf95f846aaff88e4

define $(package)_set_vars
$(package)_config_opts += -DCMAKE_BUILD_TYPE:STRING=Release
Expand Down
6 changes: 3 additions & 3 deletions depends/packages/native_cxxbridge.mk
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package=native_cxxbridge
# The version needs to match cxx in Cargo.toml
$(package)_version=1.0.126
$(package)_version=1.0.128
$(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=9ad1aecb0dae3e9419c240a5acc1ab5a19194b6eee15c53c2b4a941192ba1a18
$(package)_sha256_hash=7aa61d128d75cbfb4713e0c0803efb4da6c88180327f9e2f095641b55a5d0e06
$(package)_build_subdir=gen/cmd
$(package)_dependencies=native_rust
# This file is somewhat annoying to update, but can be done like so from the repo base:
# $ export VERSION=1.0.124
# $ export VERSION=1.0.128
# $ rm .cargo/config.toml .cargo/.configured-for-offline
# $ mkdir tmp
# $ cd tmp
Expand Down
Loading

0 comments on commit 7a93b4f

Please sign in to comment.