From da519af0fad45ba7d399dc8e2533456f6a4bce6f Mon Sep 17 00:00:00 2001 From: Monadic Cat Date: Sat, 9 Apr 2022 21:55:15 -0500 Subject: [PATCH] fix deps and update tracked files --- ableos/Cargo.lock | 7 +++++-- ableos/Cargo.toml | 2 +- kernel/Cargo.toml | 2 +- rust-toolchain | 4 +++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ableos/Cargo.lock b/ableos/Cargo.lock index cce0e9d..704a115 100644 --- a/ableos/Cargo.lock +++ b/ableos/Cargo.lock @@ -112,7 +112,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axel" version = "0.1.0" -source = "git+https://git.ablecorp.us/able/axel.git#2bd44d47d94158a85505581abbe526085ee62fb8" +source = "git+https://git.ablecorp.us/able/aos_userland.git#065a88b4b4a1fa55597f84012fd452ad4c77bee0" dependencies = [ "hashbrown 0.12.0", "log", @@ -814,7 +814,10 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "versioning" version = "0.1.2" -source = "git+https://git.ablecorp.us/able/versioning#b86e53ab8461ee4f28807bf2254d543f6d8f4727" +source = "git+https://git.ablecorp.us/able/aos_userland.git#065a88b4b4a1fa55597f84012fd452ad4c77bee0" +dependencies = [ + "serde", +] [[package]] name = "vga" diff --git a/ableos/Cargo.toml b/ableos/Cargo.toml index 8696132..8c53b40 100644 --- a/ableos/Cargo.toml +++ b/ableos/Cargo.toml @@ -57,7 +57,7 @@ rhai = "1.5" libwasm = {git="https://git.ablecorp.us:443/able/libwasm.git"} acpi = "4.1.0" -axel = { git = "https://git.ablecorp.us:443/able/axel.git" } +axel = { git = "https://git.ablecorp.us:443/able/aos_userland.git" } diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 7c1c003..740e41c 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -12,4 +12,4 @@ version = "1.4.0" default-features = false [dependencies.versioning] -git = "https://git.ablecorp.us/able/versioning" \ No newline at end of file +git = "https://git.ablecorp.us:443/able/aos_userland.git" diff --git a/rust-toolchain b/rust-toolchain index bf867e0..eb8282f 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1,3 @@ -nightly +[toolchain] +channel = "nightly-2022-02-25" +components = ["rust-src", "llvm-tools-preview"]