M-Labs
/
artiq-zynq
10
1
Fork 19
Code Issues 13 Pull Requests Releases Wiki Activity

updated zynq-rs dependency

This commit is contained in:
pca006132 2021-01-15 17:55:47 +08:00
parent a5ccabb8e6
commit 93493397ae
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
default.nix
View File

@ -20,7 +20,7 @@ let
name = "firmware"; name = "firmware";
src = ./src; src = ./src;
cargoSha256 = "0cvz5zvrr9mkh2r7wcadrrb3rlcyrv32r578g7hlqpy8ldvma8g5"; cargoSha256 = "11qxy008hb5nsir1qrh42zp8idfmc33lvc4xq9gfgj88zw6qh3d3";
nativeBuildInputs = [ nativeBuildInputs = [
pkgs.gnumake pkgs.gnumake

19
src/Cargo.lock generated
View File

@ -49,14 +49,14 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
[[package]] [[package]]
name = "compiler_builtins" name = "compiler_builtins"
version = "0.1.35" version = "0.1.39"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3fcd8aba10d17504c87ef12d4f62ef404c6a4703d16682a9eb5543e6cf24455" checksum = "3748f82c7d366a0b4950257d19db685d4958d2fa27c6d164a3f069fec42b748b"
[[package]] [[package]]
name = "core_io" name = "core_io"
version = "0.1.20200410" 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 = [ dependencies = [
"memchr", "memchr",
] ]
@ -186,7 +186,7 @@ dependencies = [
[[package]] [[package]]
name = "libasync" name = "libasync"
version = "0.0.0" 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 = [ dependencies = [
"embedded-hal", "embedded-hal",
"libcortex_a9", "libcortex_a9",
@ -198,7 +198,7 @@ dependencies = [
[[package]] [[package]]
name = "libboard_zynq" name = "libboard_zynq"
version = "0.0.0" 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 = [ dependencies = [
"bit_field", "bit_field",
"embedded-hal", "embedded-hal",
@ -223,7 +223,7 @@ dependencies = [
[[package]] [[package]]
name = "libconfig" name = "libconfig"
version = "0.1.0" 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 = [ dependencies = [
"core_io", "core_io",
"fatfs", "fatfs",
@ -234,7 +234,7 @@ dependencies = [
[[package]] [[package]]
name = "libcortex_a9" name = "libcortex_a9"
version = "0.0.0" 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 = [ dependencies = [
"bit_field", "bit_field",
"libregister", "libregister",
@ -250,7 +250,7 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
[[package]] [[package]]
name = "libregister" name = "libregister"
version = "0.0.0" 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 = [ dependencies = [
"bit_field", "bit_field",
"vcell", "vcell",
@ -260,8 +260,9 @@ dependencies = [
[[package]] [[package]]
name = "libsupport_zynq" name = "libsupport_zynq"
version = "0.0.0" 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 = [ dependencies = [
"cc",
"compiler_builtins", "compiler_builtins",
"libboard_zynq", "libboard_zynq",
"libcortex_a9", "libcortex_a9",

4
zynq-rs.nix
View File

@ -3,6 +3,6 @@ let
in in
pkgs.fetchgit { pkgs.fetchgit {
url = "https://git.m-labs.hk/M-Labs/zynq-rs.git"; url = "https://git.m-labs.hk/M-Labs/zynq-rs.git";
rev = "b4d91e7904423b6477eb1f25b8cc3940e197e9c2"; rev = "4aa252546f3559c9060ce731943372ad30d16eef";
sha256 = "0g77s9jmbyxzkpnn2rs2sya5ia2admgkn74kzl2h1n4nckfk2nn6"; sha256 = "0q9b75w6mbnsyyryainng27glxwhis325bmpv4bvzm7r9almsvks";
} }