From 3a8a025d5fa2be1d4bd4e86dcef0b422fad9cae9 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 6 Aug 2020 20:33:23 +0800 Subject: [PATCH] update dependencies, zc706 -> zynq-rs --- default.nix | 2 +- src/Cargo.lock | 30 +++++++++++++++--------------- src/libc/Cargo.toml | 2 +- src/libdyld/Cargo.toml | 3 +-- src/runtime/Cargo.toml | 10 +++++----- src/szl/Cargo.toml | 6 +++--- 6 files changed, 26 insertions(+), 27 deletions(-) diff --git a/default.nix b/default.nix index 885e2db..78a19a1 100644 --- a/default.nix +++ b/default.nix @@ -14,7 +14,7 @@ let version = "0.1.0"; src = ./src; - cargoSha256 = "1lxjb37vl7s359r4801n7b73wnm3p28qlafl04vs9pznadcf6ar0"; + cargoSha256 = "0w1d9z6k1ag5ylaz961xr3q957nj1ask07rmkmarb1kw933hr3lp"; nativeBuildInputs = [ pkgs.gnumake diff --git a/src/Cargo.lock b/src/Cargo.lock index e97e3c7..5262a06 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -201,7 +201,7 @@ dependencies = [ [[package]] name = "libasync" version = "0.0.0" -source = "git+https://git.m-labs.hk/M-Labs/zc706.git#3958953ceb56aa81e33fb4f3d19ab7ee4c06d1ba" +source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#e8ba73a8c74f79f543db6a495ac65aae68e18bab" dependencies = [ "embedded-hal", "libcortex_a9", @@ -213,7 +213,7 @@ dependencies = [ [[package]] name = "libboard_zynq" version = "0.0.0" -source = "git+https://git.m-labs.hk/M-Labs/zc706.git#3958953ceb56aa81e33fb4f3d19ab7ee4c06d1ba" +source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#e8ba73a8c74f79f543db6a495ac65aae68e18bab" dependencies = [ "bit_field", "embedded-hal", @@ -237,7 +237,7 @@ dependencies = [ [[package]] name = "libcortex_a9" version = "0.0.0" -source = "git+https://git.m-labs.hk/M-Labs/zc706.git#3958953ceb56aa81e33fb4f3d19ab7ee4c06d1ba" +source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#e8ba73a8c74f79f543db6a495ac65aae68e18bab" dependencies = [ "bit_field", "libregister", @@ -252,7 +252,7 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libregister" version = "0.0.0" -source = "git+https://git.m-labs.hk/M-Labs/zc706.git#3958953ceb56aa81e33fb4f3d19ab7ee4c06d1ba" +source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#e8ba73a8c74f79f543db6a495ac65aae68e18bab" dependencies = [ "bit_field", "vcell", @@ -262,7 +262,7 @@ dependencies = [ [[package]] name = "libsupport_zynq" version = "0.0.0" -source = "git+https://git.m-labs.hk/M-Labs/zc706.git#3958953ceb56aa81e33fb4f3d19ab7ee4c06d1ba" +source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#e8ba73a8c74f79f543db6a495ac65aae68e18bab" dependencies = [ "compiler_builtins", "libboard_zynq", @@ -322,9 +322,9 @@ checksum = "546c37ac5d9e56f55e73b677106873d9d9f5190605e41a856503623648488cae" [[package]] name = "num-derive" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c8b15b261814f992e33760b1fca9fe8b693d8a65299f20c9901688636cfb746" +checksum = "e0396233fb2d5b0ae3f05ff6aba9a09185f7f6e70f87fb01147d545f85364665" dependencies = [ "proc-macro2", "quote", @@ -342,18 +342,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17" +checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7" +checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f" dependencies = [ "proc-macro2", "quote", @@ -368,9 +368,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "proc-macro-hack" -version = "0.5.16" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4" +checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598" [[package]] name = "proc-macro-nested" @@ -445,9 +445,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.35" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb7f4c519df8c117855e19dd8cc851e89eb746fe7a73f0157e0d95fdec5369b0" +checksum = "e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c1f4" dependencies = [ "proc-macro2", "quote", diff --git a/src/libc/Cargo.toml b/src/libc/Cargo.toml index 3399f41..006d80b 100644 --- a/src/libc/Cargo.toml +++ b/src/libc/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" build = "build.rs" [dependencies] -libboard_zynq = { git = "https://git.m-labs.hk/M-Labs/zc706.git" } +libboard_zynq = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" } [build-dependencies] cc = { version = "1.0.1" } diff --git a/src/libdyld/Cargo.toml b/src/libdyld/Cargo.toml index 0ffc81f..97da8db 100644 --- a/src/libdyld/Cargo.toml +++ b/src/libdyld/Cargo.toml @@ -8,5 +8,4 @@ name = "dyld" [dependencies] log = "0.4" -libcortex_a9 = { git = "https://git.m-labs.hk/M-Labs/zc706.git" } - +libcortex_a9 = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" } diff --git a/src/runtime/Cargo.toml b/src/runtime/Cargo.toml index c4b4a7e..0137b05 100644 --- a/src/runtime/Cargo.toml +++ b/src/runtime/Cargo.toml @@ -26,11 +26,11 @@ log_buffer = { version = "1.2" } libm = { version = "0.2", features = ["unstable"] } vcell = "0.1" -libboard_zynq = { git = "https://git.m-labs.hk/M-Labs/zc706.git" } -libsupport_zynq = { default-features = false, features = ["alloc_core"], git = "https://git.m-labs.hk/M-Labs/zc706.git" } -libcortex_a9 = { git = "https://git.m-labs.hk/M-Labs/zc706.git" } -libasync = { git = "https://git.m-labs.hk/M-Labs/zc706.git" } -libregister = { git = "https://git.m-labs.hk/M-Labs/zc706.git" } +libboard_zynq = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" } +libsupport_zynq = { default-features = false, features = ["alloc_core"], git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" } +libcortex_a9 = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" } +libasync = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" } +libregister = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" } dyld = { path = "../libdyld" } dwarf = { path = "../libdwarf" } diff --git a/src/szl/Cargo.toml b/src/szl/Cargo.toml index c97c1c3..2b541b7 100644 --- a/src/szl/Cargo.toml +++ b/src/szl/Cargo.toml @@ -12,9 +12,9 @@ default = ["target_zc706"] [dependencies] log = "0.4" cstr_core = { version = "0.2", default-features = false } -libboard_zynq = { git = "https://git.m-labs.hk/M-Labs/zc706.git" } -libsupport_zynq = { git = "https://git.m-labs.hk/M-Labs/zc706.git" } -libcortex_a9 = { git = "https://git.m-labs.hk/M-Labs/zc706.git" } +libboard_zynq = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" } +libsupport_zynq = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" } +libcortex_a9 = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" } [build-dependencies] cc = { version = "1.0.1" }