From a9697ec8d8d330f8ebae249f00b45b8fbd269737 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 29 May 2021 13:05:35 +0800 Subject: [PATCH] Revert "update dependencies" This reverts commit 0220cf19eb2767c43415f374daf9316d8f3e6730. --- Cargo.lock | 50 +++++++++++++------------------------------------- default.nix | 4 ++-- 2 files changed, 15 insertions(+), 39 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 538ad6e..c79e70b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,15 +14,15 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" [[package]] name = "cc" -version = "1.0.68" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" +checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" [[package]] name = "cfg-if" @@ -43,20 +43,11 @@ dependencies = [ "memchr", ] -[[package]] -name = "core_io" -version = "0.1.20210325" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97f8932064288cc79feb4d343a399d353a6f6f001e586ece47fe518a9e8507df" -dependencies = [ - "rustc_version", -] - [[package]] name = "embedded-hal" -version = "0.2.5" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db184d3fa27bc7a2344250394c0264144dfe0bc81a4401801dcb964b8dd172ad" +checksum = "fa998ce59ec9765d15216393af37a58961ddcefb14c753b4816ba2191d865fcb" dependencies = [ "nb 0.1.3", "void", @@ -83,7 +74,7 @@ checksum = "e18f80a87439240dac45d927fd8f8081b6f1e34c03e97271189fa8a8c2e96c8f" dependencies = [ "bitflags", "byteorder", - "core_io 0.1.20210325", + "core_io", "log", ] @@ -118,7 +109,7 @@ dependencies = [ name = "libconfig" version = "0.1.0" dependencies = [ - "core_io 0.1.20210325", + "core_io", "fatfs", "libboard_zynq", "log", @@ -178,9 +169,9 @@ checksum = "c75de51135344a4f8ed3cfe2720dc27736f7711989703a0b43aadf3753c55577" [[package]] name = "memchr" -version = "2.4.0" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" [[package]] name = "nb" @@ -209,26 +200,11 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd7a31eed1591dcbc95d92ad7161908e72f4677f8fabf2a32ca49b4237cbf211" -[[package]] -name = "rustc_version" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084" -dependencies = [ - "semver", -] - -[[package]] -name = "semver" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac" - [[package]] name = "smoltcp" -version = "0.7.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11b5647cc4676e9358e6b15b6536b34e5b413e5ae946a06b3f85e713132bcdfa" +checksum = "ab527c390c7e107f687bd92a886a083fde61b8cdc700b37f3d7e4346ffd8fae1" dependencies = [ "bitflags", "byteorder", @@ -240,7 +216,7 @@ name = "szl" version = "0.1.0" dependencies = [ "byteorder", - "core_io 0.1.20210325", + "core_io", "libboard_zynq", "libconfig", "libcortex_a9", diff --git a/default.nix b/default.nix index 2ebfb17..dc0d85a 100644 --- a/default.nix +++ b/default.nix @@ -2,8 +2,8 @@ let pkgs = import { overlays = [ (import ./nix/mozilla-overlay.nix) ]; }; rustPlatform = (import ./nix/rust-platform.nix { inherit pkgs; }); cargo-xbuild = (pkgs.cargo-xbuild.overrideAttrs(oa: { patches = oa.patches ++ [ ./xbuild_writable_lockfile.diff ]; } )); - cargoSha256Experiments = "152i79x3mk6p1b1fpx91b4mvqv6yqwh315ih751lizwp8pyi4n80"; - cargoSha256SZL = "1qfhwzb83a5wa2ilfdk20jldbcrbfck8siglrznv90hwrfdvvgr2"; + cargoSha256Experiments = "107zc5n5xgzpw9i4j7r40pzl5pihlkmzx2gy934fhb6ybkfz9rnx"; + cargoSha256SZL = "1vvn8c6nxl6p8sib19d0ah1kbimh48p86c8pjb878day4d1irbdl"; build-crate = name: crate: features: cargoSha256: rustPlatform.buildRustPackage rec { name = "${crate}";