From 1796d4e236a86cbdfc712b879a8178c022b0643d Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Tue, 13 Oct 2020 18:28:42 +0800 Subject: [PATCH] update some dependencies Older versions do not compile with newer Rust. --- Cargo.lock | 158 ++++++++++++++++++++++---------------------- default.nix | 14 ++-- libasync/Cargo.toml | 2 +- 3 files changed, 87 insertions(+), 87 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 39814b8..1d6d5ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,238 +4,236 @@ name = "bit_field" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" [[package]] name = "bitflags" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "byteorder" version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" [[package]] name = "cfg-if" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "compiler_builtins" version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3fcd8aba10d17504c87ef12d4f62ef404c6a4703d16682a9eb5543e6cf24455" [[package]] name = "core_io" version = "0.1.20200410" dependencies = [ - "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr", ] [[package]] name = "embedded-hal" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa998ce59ec9765d15216393af37a58961ddcefb14c753b4816ba2191d865fcb" dependencies = [ - "nb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "nb 0.1.3", + "void", ] [[package]] name = "experiments" version = "0.0.0" dependencies = [ - "embedded-hal 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libasync 0.0.0", - "libboard_zynq 0.0.0", - "libcortex_a9 0.0.0", - "libregister 0.0.0", - "libsupport_zynq 0.0.0", - "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "embedded-hal", + "libasync", + "libboard_zynq", + "libcortex_a9", + "libregister", + "libsupport_zynq", + "log", ] [[package]] name = "fatfs" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93079df23039e52059e1f03b4c29fb0c72da2c792aad91bb2236c9fb81d3592e" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "core_io 0.1.20200410", - "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "byteorder", + "core_io", + "log", ] [[package]] name = "libasync" version = "0.0.0" dependencies = [ - "embedded-hal 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libcortex_a9 0.0.0", - "nb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "pin-utils 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smoltcp 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "embedded-hal", + "libcortex_a9", + "nb 1.0.0", + "pin-utils", + "smoltcp", ] [[package]] name = "libboard_zynq" version = "0.0.0" dependencies = [ - "bit_field 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "embedded-hal 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libcortex_a9 0.0.0", - "libregister 0.0.0", - "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", - "nb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "smoltcp 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "volatile-register 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bit_field", + "embedded-hal", + "libcortex_a9", + "libregister", + "log", + "nb 0.1.3", + "smoltcp", + "void", + "volatile-register", ] [[package]] name = "libconfig" version = "0.1.0" dependencies = [ - "core_io 0.1.20200410", - "fatfs 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libboard_zynq 0.0.0", - "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "core_io", + "fatfs", + "libboard_zynq", + "log", ] [[package]] name = "libcortex_a9" version = "0.0.0" dependencies = [ - "bit_field 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libregister 0.0.0", - "volatile-register 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bit_field", + "libregister", + "volatile-register", ] [[package]] name = "libregister" version = "0.0.0" dependencies = [ - "bit_field 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "vcell 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "volatile-register 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bit_field", + "vcell", + "volatile-register", ] [[package]] name = "libsupport_zynq" version = "0.0.0" dependencies = [ - "compiler_builtins 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "libboard_zynq 0.0.0", - "libcortex_a9 0.0.0", - "libregister 0.0.0", - "linked_list_allocator 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", - "r0 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "compiler_builtins", + "libboard_zynq", + "libcortex_a9", + "libregister", + "linked_list_allocator", + "r0", ] [[package]] name = "linked_list_allocator" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84565678e403453d1a27a0886882b3b271701e65146d972d9d7d9a4c4a0ff498" [[package]] name = "log" version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", ] [[package]] name = "managed" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75de51135344a4f8ed3cfe2720dc27736f7711989703a0b43aadf3753c55577" [[package]] name = "memchr" version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" [[package]] name = "nb" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "801d31da0513b6ec5214e9bf433a77966320625a37860f910be265be6e18d06f" dependencies = [ - "nb 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "nb 1.0.0", ] [[package]] name = "nb" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "546c37ac5d9e56f55e73b677106873d9d9f5190605e41a856503623648488cae" [[package]] name = "pin-utils" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "r0" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd7a31eed1591dcbc95d92ad7161908e72f4677f8fabf2a32ca49b4237cbf211" [[package]] name = "smoltcp" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fe46639fd2ec79eadf8fe719f237a7a0bd4dac5d957f1ca5bbdbc1c3c39e53a" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "managed 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "byteorder", + "managed", ] [[package]] name = "szl" version = "0.1.0" dependencies = [ - "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "core_io 0.1.20200410", - "libboard_zynq 0.0.0", - "libconfig 0.1.0", - "libcortex_a9 0.0.0", - "libregister 0.0.0", - "libsupport_zynq 0.0.0", - "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder", + "core_io", + "libboard_zynq", + "libconfig", + "libcortex_a9", + "libregister", + "libsupport_zynq", + "log", ] [[package]] name = "vcell" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876e32dcadfe563a4289e994f7cb391197f362b6315dc45e8ba4aa6f564a4b3c" [[package]] name = "void" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "volatile-register" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d67cb4616d99b940db1d6bd28844ff97108b498a6ca850e5b6191a532063286" dependencies = [ - "vcell 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "vcell", ] - -[metadata] -"checksum bit_field 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" -"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -"checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" -"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -"checksum compiler_builtins 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "e3fcd8aba10d17504c87ef12d4f62ef404c6a4703d16682a9eb5543e6cf24455" -"checksum embedded-hal 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "fa998ce59ec9765d15216393af37a58961ddcefb14c753b4816ba2191d865fcb" -"checksum fatfs 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "93079df23039e52059e1f03b4c29fb0c72da2c792aad91bb2236c9fb81d3592e" -"checksum linked_list_allocator 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)" = "660b26e6156a7d00eefb19052fe1943cf5ab2f353a723a577fad6ba2f99d1f90" -"checksum log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" -"checksum managed 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c75de51135344a4f8ed3cfe2720dc27736f7711989703a0b43aadf3753c55577" -"checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" -"checksum nb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "801d31da0513b6ec5214e9bf433a77966320625a37860f910be265be6e18d06f" -"checksum nb 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "546c37ac5d9e56f55e73b677106873d9d9f5190605e41a856503623648488cae" -"checksum pin-utils 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -"checksum r0 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd7a31eed1591dcbc95d92ad7161908e72f4677f8fabf2a32ca49b4237cbf211" -"checksum smoltcp 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0fe46639fd2ec79eadf8fe719f237a7a0bd4dac5d957f1ca5bbdbc1c3c39e53a" -"checksum vcell 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "876e32dcadfe563a4289e994f7cb391197f362b6315dc45e8ba4aa6f564a4b3c" -"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -"checksum volatile-register 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d67cb4616d99b940db1d6bd28844ff97108b498a6ca850e5b6191a532063286" diff --git a/default.nix b/default.nix index e668ff4..7c9dad8 100644 --- a/default.nix +++ b/default.nix @@ -1,12 +1,14 @@ let pkgs = import { overlays = [ (import ./nix/mozilla-overlay.nix) ]; }; rustPlatform = (import ./nix/rust-platform.nix { inherit pkgs; }); - build-crate = name: crate: features: + cargoSha256Experiments = "0ijb3ma7mip48ayc3hilma42rwlz3krb755klmnwwwvxhdhw29w2"; + cargoSha256SZL = "0shz0kzjnmqvwy68km71awn7krn1109nanyckhzvrxy1l1jxg2rd"; + build-crate = name: crate: features: cargoSha256: rustPlatform.buildRustPackage rec { name = "${crate}"; src = ./.; - cargoSha256 = "1f2psa1g41pl2j8n60hhik2s2pqdfjhr5capimvajf81kxrnn2ck"; + inherit cargoSha256; nativeBuildInputs = [ (pkgs.cargo-xbuild.overrideAttrs(oa: { patches = oa.patches ++ [ ./xbuild_writable_lockfile.diff ]; } )) @@ -32,9 +34,9 @@ let }; in { - zc706-experiments = build-crate "zc706-experiments" "experiments" "target_zc706"; - cora-experiments = build-crate "cora-experiments" "experiments" "target_cora_z7_10"; - redpitaya-experiments = build-crate "redpitaya-experiments" "experiments" "target_redpitaya"; + zc706-experiments = build-crate "zc706-experiments" "experiments" "target_zc706" cargoSha256Experiments; + cora-experiments = build-crate "cora-experiments" "experiments" "target_cora_z7_10" cargoSha256Experiments; + redpitaya-experiments = build-crate "redpitaya-experiments" "experiments" "target_redpitaya" cargoSha256Experiments; zc706-fsbl = (import ./nix/fsbl.nix { inherit pkgs; }); - zc706-szl = build-crate "zc706-szl" "szl" "target_zc706"; + zc706-szl = build-crate "zc706-szl" "szl" "target_zc706" cargoSha256SZL; } diff --git a/libasync/Cargo.toml b/libasync/Cargo.toml index b42a320..e943b54 100644 --- a/libasync/Cargo.toml +++ b/libasync/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" #futures = { version = "0.3", default-features = false } pin-utils = "0.1.0-alpha.4" embedded-hal = "0.2" -nb = "0.1" +nb = "1.0" libcortex_a9 = { path = "../libcortex_a9" } [dependencies.smoltcp]