From a560c24d6b6557f549ac5a4d256169c4eb0683ae Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Wed, 11 Apr 2018 08:06:40 -0600 Subject: [PATCH] depends: Update to latest librustzcash with sapling-crypto dependencies --- depends/packages/crate_arrayvec.mk | 15 +++++++++++ depends/packages/crate_bellman.mk | 15 +++++++++++ depends/packages/crate_bit_vec.mk | 15 +++++++++++ depends/packages/crate_bitflags.mk | 15 +++++++++++ depends/packages/crate_blake2_rfc.mk | 16 ++++++++++++ depends/packages/crate_byteorder.mk | 15 +++++++++++ depends/packages/crate_constant_time_eq.mk | 15 +++++++++++ depends/packages/crate_crossbeam.mk | 15 +++++++++++ depends/packages/crate_digest.mk | 15 +++++++++++ depends/packages/crate_fuchsia_zircon.mk | 15 +++++++++++ depends/packages/crate_fuchsia_zircon_sys.mk | 15 +++++++++++ depends/packages/crate_futures.mk | 15 +++++++++++ depends/packages/crate_futures_cpupool.mk | 15 +++++++++++ depends/packages/crate_generic_array.mk | 15 +++++++++++ depends/packages/crate_libc.mk | 4 +-- depends/packages/crate_nodrop.mk | 15 +++++++++++ depends/packages/crate_num_cpus.mk | 15 +++++++++++ depends/packages/crate_pairing.mk | 15 +++++++++++ depends/packages/crate_rand.mk | 15 +++++++++++ depends/packages/crate_sapling_crypto.mk | 16 ++++++++++++ depends/packages/crate_typenum.mk | 15 +++++++++++ depends/packages/crate_winapi.mk | 15 +++++++++++ .../crate_winapi_i686_pc_windows_gnu.mk | 15 +++++++++++ .../crate_winapi_x86_64_pc_windows_gnu.mk | 15 +++++++++++ depends/packages/librustzcash.mk | 4 +-- depends/packages/packages.mk | 26 ++++++++++++++++++- depends/patches/librustzcash/cargo.config | 10 +++++++ 27 files changed, 386 insertions(+), 5 deletions(-) create mode 100644 depends/packages/crate_arrayvec.mk create mode 100644 depends/packages/crate_bellman.mk create mode 100644 depends/packages/crate_bit_vec.mk create mode 100644 depends/packages/crate_bitflags.mk create mode 100644 depends/packages/crate_blake2_rfc.mk create mode 100644 depends/packages/crate_byteorder.mk create mode 100644 depends/packages/crate_constant_time_eq.mk create mode 100644 depends/packages/crate_crossbeam.mk create mode 100644 depends/packages/crate_digest.mk create mode 100644 depends/packages/crate_fuchsia_zircon.mk create mode 100644 depends/packages/crate_fuchsia_zircon_sys.mk create mode 100644 depends/packages/crate_futures.mk create mode 100644 depends/packages/crate_futures_cpupool.mk create mode 100644 depends/packages/crate_generic_array.mk create mode 100644 depends/packages/crate_nodrop.mk create mode 100644 depends/packages/crate_num_cpus.mk create mode 100644 depends/packages/crate_pairing.mk create mode 100644 depends/packages/crate_rand.mk create mode 100644 depends/packages/crate_sapling_crypto.mk create mode 100644 depends/packages/crate_typenum.mk create mode 100644 depends/packages/crate_winapi.mk create mode 100644 depends/packages/crate_winapi_i686_pc_windows_gnu.mk create mode 100644 depends/packages/crate_winapi_x86_64_pc_windows_gnu.mk diff --git a/depends/packages/crate_arrayvec.mk b/depends/packages/crate_arrayvec.mk new file mode 100644 index 000000000..7de373351 --- /dev/null +++ b/depends/packages/crate_arrayvec.mk @@ -0,0 +1,15 @@ +package=crate_arrayvec +$(package)_crate_name=arrayvec +$(package)_version=0.4.7 +$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) +$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate +$(package)_sha256_hash=a1e964f9e24d588183fcb43503abda40d288c8657dfc27311516ce2f05675aef +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/crate_bellman.mk b/depends/packages/crate_bellman.mk new file mode 100644 index 000000000..5c7d904ca --- /dev/null +++ b/depends/packages/crate_bellman.mk @@ -0,0 +1,15 @@ +package=crate_bellman +$(package)_crate_name=bellman +$(package)_version=0.1.0 +$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) +$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate +$(package)_sha256_hash=eae372472c7ea8f7c8fc6a62f7d5535db8302de7f1aafda2e13a97c4830d3bcf +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/crate_bit_vec.mk b/depends/packages/crate_bit_vec.mk new file mode 100644 index 000000000..40575088e --- /dev/null +++ b/depends/packages/crate_bit_vec.mk @@ -0,0 +1,15 @@ +package=crate_bit_vec +$(package)_crate_name=bit-vec +$(package)_version=0.4.4 +$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) +$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate +$(package)_sha256_hash=02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/crate_bitflags.mk b/depends/packages/crate_bitflags.mk new file mode 100644 index 000000000..844ec37e8 --- /dev/null +++ b/depends/packages/crate_bitflags.mk @@ -0,0 +1,15 @@ +package=crate_bitflags +$(package)_crate_name=bitflags +$(package)_version=1.0.1 +$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) +$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate +$(package)_sha256_hash=b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/crate_blake2_rfc.mk b/depends/packages/crate_blake2_rfc.mk new file mode 100644 index 000000000..73ef7edde --- /dev/null +++ b/depends/packages/crate_blake2_rfc.mk @@ -0,0 +1,16 @@ +package=crate_blake2_rfc +$(package)_crate_name=blake2-rfc +$(package)_download_path=https://github.com/gtank/$($(package)_crate_name)/archive/ +$(package)_file_name=$(package)-$($(package)_git_commit).tar.gz +$(package)_download_file=$($(package)_git_commit).tar.gz +$(package)_sha256_hash=8a873cc41f02e669e8071ab5919931dd4263f050becf0c19820b0497c07b0ca3 +$(package)_git_commit=7a5b5fc99ae483a0043db7547fb79a6fa44b88a9 +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_unpackaged_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/crate_byteorder.mk b/depends/packages/crate_byteorder.mk new file mode 100644 index 000000000..0df286920 --- /dev/null +++ b/depends/packages/crate_byteorder.mk @@ -0,0 +1,15 @@ +package=crate_byteorder +$(package)_crate_name=byteorder +$(package)_version=1.2.2 +$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) +$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate +$(package)_sha256_hash=73b5bdfe7ee3ad0b99c9801d58807a9dbc9e09196365b0203853b99889ab3c87 +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/crate_constant_time_eq.mk b/depends/packages/crate_constant_time_eq.mk new file mode 100644 index 000000000..b782dfb22 --- /dev/null +++ b/depends/packages/crate_constant_time_eq.mk @@ -0,0 +1,15 @@ +package=crate_constant_time_eq +$(package)_crate_name=constant_time_eq +$(package)_version=0.1.3 +$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) +$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate +$(package)_sha256_hash=8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/crate_crossbeam.mk b/depends/packages/crate_crossbeam.mk new file mode 100644 index 000000000..3b31aa53b --- /dev/null +++ b/depends/packages/crate_crossbeam.mk @@ -0,0 +1,15 @@ +package=crate_crossbeam +$(package)_crate_name=crossbeam +$(package)_version=0.3.2 +$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) +$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate +$(package)_sha256_hash=24ce9782d4d5c53674646a6a4c1863a21a8fc0cb649b3c94dfc16e45071dea19 +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/crate_digest.mk b/depends/packages/crate_digest.mk new file mode 100644 index 000000000..029ccd7bd --- /dev/null +++ b/depends/packages/crate_digest.mk @@ -0,0 +1,15 @@ +package=crate_digest +$(package)_crate_name=digest +$(package)_version=0.7.2 +$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) +$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate +$(package)_sha256_hash=00a49051fef47a72c9623101b19bd71924a45cca838826caae3eaa4d00772603 +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/crate_fuchsia_zircon.mk b/depends/packages/crate_fuchsia_zircon.mk new file mode 100644 index 000000000..f8e10aa55 --- /dev/null +++ b/depends/packages/crate_fuchsia_zircon.mk @@ -0,0 +1,15 @@ +package=crate_fuchsia_zircon +$(package)_crate_name=fuchsia-zircon +$(package)_version=0.3.3 +$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) +$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate +$(package)_sha256_hash=2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82 +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/crate_fuchsia_zircon_sys.mk b/depends/packages/crate_fuchsia_zircon_sys.mk new file mode 100644 index 000000000..bc978bbb2 --- /dev/null +++ b/depends/packages/crate_fuchsia_zircon_sys.mk @@ -0,0 +1,15 @@ +package=crate_fuchsia_zircon_sys +$(package)_crate_name=fuchsia-zircon-sys +$(package)_version=0.3.3 +$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) +$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate +$(package)_sha256_hash=3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7 +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/crate_futures.mk b/depends/packages/crate_futures.mk new file mode 100644 index 000000000..3e0e6f990 --- /dev/null +++ b/depends/packages/crate_futures.mk @@ -0,0 +1,15 @@ +package=crate_futures +$(package)_crate_name=futures +$(package)_version=0.1.21 +$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) +$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate +$(package)_sha256_hash=1a70b146671de62ec8c8ed572219ca5d594d9b06c0b364d5e67b722fc559b48c +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/crate_futures_cpupool.mk b/depends/packages/crate_futures_cpupool.mk new file mode 100644 index 000000000..0ff2069ed --- /dev/null +++ b/depends/packages/crate_futures_cpupool.mk @@ -0,0 +1,15 @@ +package=crate_futures_cpupool +$(package)_crate_name=futures-cpupool +$(package)_version=0.1.8 +$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) +$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate +$(package)_sha256_hash=ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4 +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/crate_generic_array.mk b/depends/packages/crate_generic_array.mk new file mode 100644 index 000000000..ab4a566ee --- /dev/null +++ b/depends/packages/crate_generic_array.mk @@ -0,0 +1,15 @@ +package=crate_generic_array +$(package)_crate_name=generic-array +$(package)_version=0.9.0 +$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) +$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate +$(package)_sha256_hash=ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/crate_libc.mk b/depends/packages/crate_libc.mk index 29060421f..2e1a2c074 100644 --- a/depends/packages/crate_libc.mk +++ b/depends/packages/crate_libc.mk @@ -1,9 +1,9 @@ package=crate_libc $(package)_crate_name=libc -$(package)_version=0.2.21 +$(package)_version=0.2.40 $(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) $(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=88ee81885f9f04bff991e306fea7c1c60a5f0f9e409e99f6b40e3311a3363135 +$(package)_sha256_hash=6fd41f331ac7c5b8ac259b8bf82c75c0fb2e469bbf37d2becbba9a6a2221965b $(package)_crate_versioned_name=$($(package)_crate_name) define $(package)_preprocess_cmds diff --git a/depends/packages/crate_nodrop.mk b/depends/packages/crate_nodrop.mk new file mode 100644 index 000000000..1997574c0 --- /dev/null +++ b/depends/packages/crate_nodrop.mk @@ -0,0 +1,15 @@ +package=crate_nodrop +$(package)_crate_name=nodrop +$(package)_version=0.1.12 +$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) +$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate +$(package)_sha256_hash=9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2 +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/crate_num_cpus.mk b/depends/packages/crate_num_cpus.mk new file mode 100644 index 000000000..fdaebe4db --- /dev/null +++ b/depends/packages/crate_num_cpus.mk @@ -0,0 +1,15 @@ +package=crate_num_cpus +$(package)_crate_name=num_cpus +$(package)_version=1.8.0 +$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) +$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate +$(package)_sha256_hash=c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30 +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/crate_pairing.mk b/depends/packages/crate_pairing.mk new file mode 100644 index 000000000..bec4804b0 --- /dev/null +++ b/depends/packages/crate_pairing.mk @@ -0,0 +1,15 @@ +package=crate_pairing +$(package)_crate_name=pairing +$(package)_version=0.14.1 +$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) +$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate +$(package)_sha256_hash=06f21a403a78257de696b59a5bfafad56a3b3ab8f27741c8122750bf0ebbb9fa +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/crate_rand.mk b/depends/packages/crate_rand.mk new file mode 100644 index 000000000..16fb81753 --- /dev/null +++ b/depends/packages/crate_rand.mk @@ -0,0 +1,15 @@ +package=crate_rand +$(package)_crate_name=rand +$(package)_version=0.4.2 +$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) +$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate +$(package)_sha256_hash=eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5 +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/crate_sapling_crypto.mk b/depends/packages/crate_sapling_crypto.mk new file mode 100644 index 000000000..376fca9a3 --- /dev/null +++ b/depends/packages/crate_sapling_crypto.mk @@ -0,0 +1,16 @@ +package=crate_sapling_crypto +$(package)_crate_name=sapling-crypto +$(package)_download_path=https://github.com/zcash-hackworks/$($(package)_crate_name)/archive/ +$(package)_file_name=$(package)-$($(package)_git_commit).tar.gz +$(package)_download_file=$($(package)_git_commit).tar.gz +$(package)_sha256_hash=5eb4040bc223a689341b3f1a1fc53d6064c4c032b23ae0c2c653b063e1da24db +$(package)_git_commit=e554b473dd10885d232f42237c13282f5b6fee43 +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_unpackaged_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/crate_typenum.mk b/depends/packages/crate_typenum.mk new file mode 100644 index 000000000..bc5a235a8 --- /dev/null +++ b/depends/packages/crate_typenum.mk @@ -0,0 +1,15 @@ +package=crate_typenum +$(package)_crate_name=typenum +$(package)_version=1.10.0 +$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) +$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate +$(package)_sha256_hash=612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169 +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/crate_winapi.mk b/depends/packages/crate_winapi.mk new file mode 100644 index 000000000..6aafb0251 --- /dev/null +++ b/depends/packages/crate_winapi.mk @@ -0,0 +1,15 @@ +package=crate_winapi +$(package)_crate_name=winapi +$(package)_version=0.3.4 +$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) +$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate +$(package)_sha256_hash=04e3bd221fcbe8a271359c04f21a76db7d0c6028862d1bb5512d85e1e2eb5bb3 +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/crate_winapi_i686_pc_windows_gnu.mk b/depends/packages/crate_winapi_i686_pc_windows_gnu.mk new file mode 100644 index 000000000..ff8c5e76f --- /dev/null +++ b/depends/packages/crate_winapi_i686_pc_windows_gnu.mk @@ -0,0 +1,15 @@ +package=crate_winapi_i686_pc_windows_gnu +$(package)_crate_name=winapi-i686-pc-windows-gnu +$(package)_version=0.4.0 +$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) +$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate +$(package)_sha256_hash=ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6 +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/crate_winapi_x86_64_pc_windows_gnu.mk b/depends/packages/crate_winapi_x86_64_pc_windows_gnu.mk new file mode 100644 index 000000000..725baf00f --- /dev/null +++ b/depends/packages/crate_winapi_x86_64_pc_windows_gnu.mk @@ -0,0 +1,15 @@ +package=crate_winapi_x86_64_pc_windows_gnu +$(package)_crate_name=winapi-x86_64-pc-windows-gnu +$(package)_version=0.4.0 +$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) +$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate +$(package)_sha256_hash=712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f +$(package)_crate_versioned_name=$($(package)_crate_name) + +define $(package)_preprocess_cmds + $(call generate_crate_checksum,$(package)) +endef + +define $(package)_stage_cmds + $(call vendor_crate_source,$(package)) +endef diff --git a/depends/packages/librustzcash.mk b/depends/packages/librustzcash.mk index 4fc554cc0..f2d63669d 100644 --- a/depends/packages/librustzcash.mk +++ b/depends/packages/librustzcash.mk @@ -3,8 +3,8 @@ $(package)_version=0.1 $(package)_download_path=https://github.com/zcash/$(package)/archive/ $(package)_file_name=$(package)-$($(package)_git_commit).tar.gz $(package)_download_file=$($(package)_git_commit).tar.gz -$(package)_sha256_hash=a5760a90d4a1045c8944204f29fa2a3cf2f800afee400f88bf89bbfe2cce1279 -$(package)_git_commit=91348647a86201a9482ad4ad68398152dc3d635e +$(package)_sha256_hash=c59d37870bf293b64c97de8991ebd2efe4e63282c5dc6d05df5a3a88e7b7b169 +$(package)_git_commit=7dc69c6893032142e353ece69420c72b4055b378 $(package)_dependencies=rust $(rust_crates) $(package)_patches=cargo.config diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk index 4c1dea677..35b9f80ac 100644 --- a/depends/packages/packages.mk +++ b/depends/packages/packages.mk @@ -1,4 +1,28 @@ -rust_crates := crate_libc +rust_crates := \ + crate_arrayvec \ + crate_bellman \ + crate_bitflags \ + crate_bit_vec \ + crate_blake2_rfc \ + crate_byteorder \ + crate_constant_time_eq \ + crate_crossbeam \ + crate_digest \ + crate_fuchsia_zircon \ + crate_fuchsia_zircon_sys \ + crate_futures_cpupool \ + crate_futures \ + crate_generic_array \ + crate_libc \ + crate_nodrop \ + crate_num_cpus \ + crate_pairing \ + crate_rand \ + crate_sapling_crypto \ + crate_typenum \ + crate_winapi_i686_pc_windows_gnu \ + crate_winapi \ + crate_winapi_x86_64_pc_windows_gnu rust_packages := rust $(rust_crates) librustzcash proton_packages := proton zcash_packages := libgmp libsodium diff --git a/depends/patches/librustzcash/cargo.config b/depends/patches/librustzcash/cargo.config index ded7ce6f7..c0229a9cc 100644 --- a/depends/patches/librustzcash/cargo.config +++ b/depends/patches/librustzcash/cargo.config @@ -1,5 +1,15 @@ [source.crates-io] replace-with = "vendored-sources" +[source."https://github.com/gtank/blake2-rfc"] +git = "https://github.com/gtank/blake2-rfc" +rev = "7a5b5fc99ae483a0043db7547fb79a6fa44b88a9" +replace-with = "vendored-sources" + +[source."https://github.com/zcash-hackworks/sapling-crypto"] +git = "https://github.com/zcash-hackworks/sapling-crypto" +rev = "e554b473dd10885d232f42237c13282f5b6fee43" +replace-with = "vendored-sources" + [source.vendored-sources] directory = "CRATE_REGISTRY"