From 93493397aec684305cc603223b72a264c5ebe126 Mon Sep 17 00:00:00 2001 From: pca006132 Date: Fri, 15 Jan 2021 17:55:47 +0800 Subject: [PATCH] updated zynq-rs dependency --- default.nix | 2 +- src/Cargo.lock | 19 ++++++++++--------- zynq-rs.nix | 4 ++-- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/default.nix b/default.nix index e24d354..ae54d00 100644 --- a/default.nix +++ b/default.nix @@ -20,7 +20,7 @@ let name = "firmware"; src = ./src; - cargoSha256 = "0cvz5zvrr9mkh2r7wcadrrb3rlcyrv32r578g7hlqpy8ldvma8g5"; + cargoSha256 = "11qxy008hb5nsir1qrh42zp8idfmc33lvc4xq9gfgj88zw6qh3d3"; nativeBuildInputs = [ pkgs.gnumake diff --git a/src/Cargo.lock b/src/Cargo.lock index 5ef5ad4..561b44f 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -49,14 +49,14 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "compiler_builtins" -version = "0.1.35" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3fcd8aba10d17504c87ef12d4f62ef404c6a4703d16682a9eb5543e6cf24455" +checksum = "3748f82c7d366a0b4950257d19db685d4958d2fa27c6d164a3f069fec42b748b" [[package]] name = "core_io" version = "0.1.20200410" -source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#966e43e14ed26e883a2de03d56cedde964283269" +source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#4aa252546f3559c9060ce731943372ad30d16eef" dependencies = [ "memchr", ] @@ -186,7 +186,7 @@ dependencies = [ [[package]] name = "libasync" version = "0.0.0" -source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#966e43e14ed26e883a2de03d56cedde964283269" +source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#4aa252546f3559c9060ce731943372ad30d16eef" dependencies = [ "embedded-hal", "libcortex_a9", @@ -198,7 +198,7 @@ dependencies = [ [[package]] name = "libboard_zynq" version = "0.0.0" -source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#966e43e14ed26e883a2de03d56cedde964283269" +source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#4aa252546f3559c9060ce731943372ad30d16eef" dependencies = [ "bit_field", "embedded-hal", @@ -223,7 +223,7 @@ dependencies = [ [[package]] name = "libconfig" version = "0.1.0" -source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#966e43e14ed26e883a2de03d56cedde964283269" +source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#4aa252546f3559c9060ce731943372ad30d16eef" dependencies = [ "core_io", "fatfs", @@ -234,7 +234,7 @@ dependencies = [ [[package]] name = "libcortex_a9" version = "0.0.0" -source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#966e43e14ed26e883a2de03d56cedde964283269" +source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#4aa252546f3559c9060ce731943372ad30d16eef" dependencies = [ "bit_field", "libregister", @@ -250,7 +250,7 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libregister" version = "0.0.0" -source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#966e43e14ed26e883a2de03d56cedde964283269" +source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#4aa252546f3559c9060ce731943372ad30d16eef" dependencies = [ "bit_field", "vcell", @@ -260,8 +260,9 @@ dependencies = [ [[package]] name = "libsupport_zynq" version = "0.0.0" -source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#966e43e14ed26e883a2de03d56cedde964283269" +source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#4aa252546f3559c9060ce731943372ad30d16eef" dependencies = [ + "cc", "compiler_builtins", "libboard_zynq", "libcortex_a9", diff --git a/zynq-rs.nix b/zynq-rs.nix index 2305700..f1899d6 100644 --- a/zynq-rs.nix +++ b/zynq-rs.nix @@ -3,6 +3,6 @@ let in pkgs.fetchgit { url = "https://git.m-labs.hk/M-Labs/zynq-rs.git"; - rev = "b4d91e7904423b6477eb1f25b8cc3940e197e9c2"; - sha256 = "0g77s9jmbyxzkpnn2rs2sya5ia2admgkn74kzl2h1n4nckfk2nn6"; + rev = "4aa252546f3559c9060ce731943372ad30d16eef"; + sha256 = "0q9b75w6mbnsyyryainng27glxwhis325bmpv4bvzm7r9almsvks"; }