From 8d532dc50a7a47cb3c535f481f29da4e36d314eb Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 23 Mar 2020 00:25:06 +0100 Subject: [PATCH] Cargo.toml: use patch for dependency stm32f4xx-hal --- Cargo.lock | 5 +++-- Cargo.toml | 7 +++++-- cargosha256.nix | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8df73bd..d7bcb99 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -298,6 +298,7 @@ checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" [[package]] name = "stm32-eth" version = "0.1.2" +source = "git+https://github.com/stm32-rs/stm32-eth.git#2c5dce379b85a31fb0b9c58a028b6454be1727aa" dependencies = [ "aligned", "log", @@ -336,9 +337,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "123bd9499cfb380418d509322d7a6d52e5315f064fe4b3ad18a53d6b92c07859" +checksum = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 57848f1..fbee09d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,8 +21,7 @@ bare-metal = "0.2" cortex-m = "0.6" cortex-m-rt = { version = "0.6", features = ["device"] } cortex-m-log = { version = "0.6", features = ["log-integration"] } -# TODO: pending https://github.com/stm32-rs/stm32f4xx-hal/pull/125 -stm32f4xx-hal = { git = "https://github.com/thalesfragoso/stm32f4xx-hal", branch = "pwm-impl", features = ["rt", "stm32f427"] } +stm32f4xx-hal = { version = "0.7", features = ["rt", "stm32f427"] } stm32-eth = { version = "0.1.2", features = ["smoltcp-phy"], git = "https://github.com/stm32-rs/stm32-eth.git" } smoltcp = { version = "0.6.0", default-features = false, features = ["proto-ipv4", "socket-tcp", "log"] } hash2hwaddr = { version = "0.0", optional = true } @@ -31,6 +30,10 @@ byteorder = { version = "1", default-features = false } nom = { version = "5", default-features = false } num-traits = { version = "0.2", default-features = false, features = ["libm"] } +[patch.crates-io] +# TODO: pending https://github.com/stm32-rs/stm32f4xx-hal/pull/125 +stm32f4xx-hal = { git = "https://github.com/thalesfragoso/stm32f4xx-hal", branch = "pwm-impl" } + [features] semihosting = ["panic-semihosting", "cortex-m-log/semihosting"] generate-hwaddr = ["hash2hwaddr"] diff --git a/cargosha256.nix b/cargosha256.nix index a69e1d7..c926dad 100644 --- a/cargosha256.nix +++ b/cargosha256.nix @@ -1 +1 @@ -"0yqq7z4qz29vxxc40cp2pjaifvnhacz6hm3v1s839n1q4qlkcjm5" +"044azg5w9dz784aiimgp55cvnnws18cvd7ily3j0fj0gni1k2ylm"