From 67446ae99ef4bb7d707153f8dba82bc31bdb3d41 Mon Sep 17 00:00:00 2001 From: mwojcik Date: Tue, 25 Jan 2022 10:38:47 +0800 Subject: [PATCH] cargo/flake: update package versions --- Cargo.lock | 127 +++++++++++++++++++++++++++++++++++++++-------------- Cargo.toml | 10 ++--- flake.nix | 1 - 3 files changed, 97 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 85d8279..b089ee2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -68,12 +68,9 @@ checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" [[package]] name = "cast" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0" -dependencies = [ - "rustc_version", -] +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cfg-if" @@ -82,14 +79,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] -name = "cortex-m" -version = "0.6.4" +name = "chrono" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88cdafeafba636c00c467ded7f1587210725a1adfab0c24028a7844b87738263" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "cortex-m" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9075300b07c6a56263b9b582c214d0ff037b00d45ec9fde1cc711490c56f1bb9" dependencies = [ "aligned", "bare-metal 0.2.5", "bitfield", + "cortex-m 0.7.4", + "volatile-register", +] + +[[package]] +name = "cortex-m" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37ff967e867ca14eba0c34ac25cd71ea98c678e741e3915d923999bb2fe7c826" +dependencies = [ + "bare-metal 0.2.5", + "bitfield", + "embedded-hal", "volatile-register", ] @@ -99,7 +119,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d63959cb1e003dd97233fee6762351540253237eadf06fcdcb98cbfa3f9be4a" dependencies = [ - "cortex-m", + "cortex-m 0.6.7", "cortex-m-semihosting", "log", ] @@ -110,10 +130,19 @@ version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "980c9d0233a909f355ed297ef122f257942de5e0a2cb1c39f60684b65bcb90fb" dependencies = [ - "cortex-m-rt-macros", + "cortex-m-rt-macros 0.1.8", "r0", ] +[[package]] +name = "cortex-m-rt" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c433da385b720d5bb9f52362fa2782420798e68d40d67bfe4b0d992aba5dfe7" +dependencies = [ + "cortex-m-rt-macros 0.7.0", +] + [[package]] name = "cortex-m-rt-macros" version = "0.1.8" @@ -125,13 +154,24 @@ dependencies = [ "syn", ] +[[package]] +name = "cortex-m-rt-macros" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f6f3e36f203cfedbc78b357fb28730aa2c6dc1ab060ee5c2405e843988d3c7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "cortex-m-semihosting" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bffa6c1454368a6aa4811ae60964c38e6996d397ff8095a8b9211b1c1f749bc" dependencies = [ - "cortex-m", + "cortex-m 0.7.4", ] [[package]] @@ -154,9 +194,9 @@ dependencies = [ [[package]] name = "embedded-hal" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa998ce59ec9765d15216393af37a58961ddcefb14c753b4816ba2191d865fcb" +checksum = "e36cfb62ff156596c892272f3015ef952fe1525e85261fa3a7f327bd6b384ab9" dependencies = [ "nb 0.1.3", "void", @@ -264,6 +304,16 @@ dependencies = [ "version_check", ] +[[package]] +name = "num-integer" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +dependencies = [ + "autocfg", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.14" @@ -286,7 +336,7 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3d55dedd501dfd02514646e0af4d7016ce36bc12ae177ef52056989966a1eec" dependencies = [ - "cortex-m", + "cortex-m 0.7.4", "cortex-m-semihosting", ] @@ -333,9 +383,18 @@ checksum = "e2a38df5b15c8d5c7e8654189744d8e396bddc18ad48041a500ce52d6948941f" [[package]] name = "rand_core" -version = "0.5.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" + +[[package]] +name = "rtcc" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef35f9dcbf434a34dcc99b3ebba1c1945d49c70832958e932e83dc63a5273994" +dependencies = [ + "chrono", +] [[package]] name = "rustc_version" @@ -404,9 +463,9 @@ dependencies = [ [[package]] name = "smoltcp" -version = "0.6.0" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fe46639fd2ec79eadf8fe719f237a7a0bd4dac5d957f1ca5bbdbc1c3c39e53a" +checksum = "3e4a069bef843d170df47e7c0a8bf8d037f217d9f5b325865acc3e466ffe40d3" dependencies = [ "bitflags", "byteorder", @@ -423,10 +482,10 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "stm32-eth" version = "0.2.0" -source = "git+https://github.com/stm32-rs/stm32-eth.git#4d6b29bf1ecdd1f68e5bc304a3d4f170049896c8" +source = "git+https://github.com/stm32-rs/stm32-eth.git?rev=882553d21#882553d21de4357e610505c9dd19d2abdd32c999" dependencies = [ "aligned", - "cortex-m", + "cortex-m 0.7.4", "smoltcp", "stm32f4xx-hal", "volatile-register", @@ -434,29 +493,31 @@ dependencies = [ [[package]] name = "stm32f4" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11460b4de3a84f072e2cf6e76306c64d27f405a0e83bace0a726f555ddf4bf33" +checksum = "da3d56009c8f32e4f208dbea17df72484154d1040a8969b75d8c73eb7b18fe8f" dependencies = [ "bare-metal 0.2.5", - "cortex-m", - "cortex-m-rt", + "cortex-m 0.7.4", + "cortex-m-rt 0.6.13", "vcell", ] [[package]] name = "stm32f4xx-hal" -version = "0.8.3" -source = "git+https://github.com/astro/stm32f4xx-hal.git?branch=flash#9171ef176a90b1177f350fe2bc1eac625769a041" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a06fde2dd27c0ba934c9e69b62af66eb1c20dbb6d741b187a763912e9892d13" dependencies = [ - "bare-metal 0.2.5", + "bare-metal 1.0.0", "cast", - "cortex-m", - "cortex-m-rt", + "cortex-m 0.7.4", + "cortex-m-rt 0.7.1", "embedded-dma", "embedded-hal", - "nb 0.1.3", + "nb 1.0.0", "rand_core", + "rtcc", "stm32f4", "synopsys-usb-otg", "void", @@ -479,7 +540,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "461676dcf123675b3d3b02e2390e6a690cd186aacf2f439af7673c79e2561d53" dependencies = [ - "cortex-m", + "cortex-m 0.6.7", "usb-device", "vcell", ] @@ -491,9 +552,9 @@ dependencies = [ "bare-metal 1.0.0", "bit_field", "byteorder", - "cortex-m", + "cortex-m 0.6.7", "cortex-m-log", - "cortex-m-rt", + "cortex-m-rt 0.6.13", "eeprom24x", "heapless", "log", diff --git a/Cargo.toml b/Cargo.toml index 3c8e91e..c9a2b9a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,9 +21,9 @@ bare-metal = "1" cortex-m = "0.6" cortex-m-rt = { version = "0.6", features = ["device"] } cortex-m-log = { version = "0.6", features = ["log-integration"] } -stm32f4xx-hal = { version = "0.8", features = ["rt", "stm32f427", "usb_fs"] } -stm32-eth = { version = "0.2", features = ["stm32f427", "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"] } +stm32f4xx-hal = { version = "=0.10.1", features = ["rt", "stm32f427", "usb_fs"] } +stm32-eth = { rev = "882553d21", features = ["stm32f427", "smoltcp-phy"], git = "https://github.com/stm32-rs/stm32-eth.git" } +smoltcp = { version = "0.7.0", default-features = false, features = ["proto-ipv4", "socket-tcp", "log"] } bit_field = "0.10" byteorder = { version = "1", default-features = false } nom = { version = "5", default-features = false } @@ -38,10 +38,6 @@ heapless = "0.5" serde-json-core = "0.1" sfkv = "0.1" -[patch.crates-io] -# TODO: pending https://github.com/stm32-rs/stm32f4xx-hal/pull/239 -stm32f4xx-hal = { git = "https://github.com/astro/stm32f4xx-hal.git", branch = "flash" } - [features] semihosting = ["panic-semihosting", "cortex-m-log/semihosting"] diff --git a/flake.nix b/flake.nix index b332d7c..6c84438 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,6 @@ lockFile = ./Cargo.lock; outputHashes = { "stm32-eth-0.2.0" = "sha256-HXRr/NDhdIKqyjdA4D8ZmcO1dDpDawdlYPUOwcEbPQk="; - "stm32f4xx-hal-0.8.3" = "sha256-MOv7tVtVMxr3IYMaN0Q8EQWxv3rubmCxjXMXuw/ZKAw="; }; };