From cb50c8d61b9ffbb4c88b5f2e96fa9f4394266c43 Mon Sep 17 00:00:00 2001 From: Astro Date: Fri, 13 Nov 2020 19:40:38 +0100 Subject: [PATCH] update deps, pin compiler_builtins to 0.1.35 --- Cargo.lock | 4 ++-- default.nix | 4 ++-- libsupport_zynq/Cargo.toml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1d6d5ec..2245d2d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -161,9 +161,9 @@ checksum = "c75de51135344a4f8ed3cfe2720dc27736f7711989703a0b43aadf3753c55577" [[package]] name = "memchr" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" [[package]] name = "nb" diff --git a/default.nix b/default.nix index 54a1c08..104739c 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 = "0ijb3ma7mip48ayc3hilma42rwlz3krb755klmnwwwvxhdhw29w2"; - cargoSha256SZL = "0shz0kzjnmqvwy68km71awn7krn1109nanyckhzvrxy1l1jxg2rd"; + cargoSha256Experiments = "0p446fdf78v42x71xjzilmhmzwijxn29hxcfvvkq3dhbm4v4qz9p"; + cargoSha256SZL = "17bnbp60j36fswvwfr3myq6ivcm037pwqlwc9fd6xgkphy9qjcnz"; build-crate = name: crate: features: cargoSha256: rustPlatform.buildRustPackage rec { name = "${crate}"; diff --git a/libsupport_zynq/Cargo.toml b/libsupport_zynq/Cargo.toml index c7c5118..6feb08b 100644 --- a/libsupport_zynq/Cargo.toml +++ b/libsupport_zynq/Cargo.toml @@ -17,7 +17,7 @@ default = ["panic_handler", "dummy_irq_handler"] [dependencies] r0 = "1" -compiler_builtins = "0.1" +compiler_builtins = "=0.1.35" linked_list_allocator = { version = "0.8", default-features = false } libregister = { path = "../libregister" } libcortex_a9 = { path = "../libcortex_a9" }