build: update dependencies

Signed-off-by: Yaroslav Bolyukin <[email protected]>

Author: CertainLach

Cargo.lock

@@ -3,7 +3,7 @@ name = "fleet"
 description = "NixOS configuration management"
 version = "0.1.0"
 authors = ["Yaroslav Bolyukin <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0"
@@ -14,17 +14,16 @@ tempfile = "3.2"
 once_cell = "1.5"
 hostname = "0.3.1"
 age-core = "0.7.0"
-peg = "0.7.0"
+peg = "0.8.0"
 nixlike = {path = "../../crates/nixlike"}
 age = { version = "0.7.0", features = ["ssh", "armor"] }
 base64 = "0.13.0"
 chrono = { version = "0.4.19", features = ["serde"] }
 z85 = "3.0.3"
-base58 = "*"
 structopt = "0.3.23"
 tokio = { version = "1.14.0", features = ["full"] }
 tracing = "0.1.29"
 tracing-subscriber = { version = "0.3.3", features = ["fmt", "env-filter"] }
-tokio-util = { version = "0.6.9", features = ["codec"] }
+tokio-util = { version = "0.7.0", features = ["codec"] }
 async-trait = "0.1.52"
 futures = "0.3.17"

cmds/fleet/Cargo.toml

@@ -1,3 +1,3 @@
 pub mod build_systems;
-pub mod secrets;
 pub mod info;
+pub mod secrets;

cmds/fleet/src/cmds/mod.rs

@@ -5,7 +5,7 @@ use async_trait::async_trait;
 use futures::StreamExt;
 use serde::{
 	de::{DeserializeOwned, Visitor},
-	Deserialize, 
+	Deserialize,
 };
 use tokio::{process::Command, select};
 use tokio_util::codec::{BytesCodec, FramedRead, LinesCodec};
@@ -153,9 +153,15 @@ impl CommandExt for Command {
 								NixLog::Start { text, level: 0, typ: 108, .. } if text == "" => {
 									// Cache lookup? Coupled with copy log
 								},
+								NixLog::Start { text, level: 4, typ: 109, .. } if text.starts_with("querying info about ") => {
+									// Cache lookup
+								}
 								NixLog::Start { text, level: 4, typ: 101, .. } if text.starts_with("downloading ") => {
 									// NAR downloading, coupled with copy log
 								}
+								NixLog::Start { text, level: 1, typ: 111, .. } if text.starts_with("waiting for a machine to build ") => {
+									// Useless repeating notification about build
+								}
 								NixLog::Stop { .. } => {},
 								NixLog::Result { .. } => {},
 								_ => warn!("unknown log: {:?}", log)

cmds/fleet/src/command.rs

@@ -72,8 +72,7 @@ impl Config {
 		str.push("#");
 		str.push(&format!(
 			"fleetConfigurations.default.{}.{}",
-			self.local_system,
-			name
+			self.local_system, name
 		));
 		str
 	}
@@ -89,7 +88,12 @@ impl Config {
 	pub async fn config_attr<T: DeserializeOwned>(&self, host: &str, attr: &str) -> Result<T> {
 		Command::new("nix")
 			.arg("eval")
-			.arg(self.configuration_attr_name(&format!("configuredSystems.{}.config.{}", host, attr)))
+			.arg(
+				self.configuration_attr_name(&format!(
+					"configuredSystems.{}.config.{}",
+					host, attr
+				)),
+			)
 			.args(&["--json", "--show-trace"])
 			.run_nix_json()
 			.await

cmds/fleet/src/host.rs

@@ -1,7 +1,7 @@
+pub mod cmds;
 pub mod command;
 pub mod host;
 pub mod keys;
-pub mod cmds;
 
 mod fleetdata;
 

cmds/fleet/src/main.rs

@@ -1,14 +1,14 @@
 [package]
 name = "fleet-install-secrets"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
-age = { version = "0.6.0", features = ["ssh"] }
+age = { version = "0.7.1", features = ["ssh"] }
 anyhow = "1.0.44"
 env_logger = "0.9.0"
 log = "0.4.14"
-nix = "0.22.1"
+nix = "0.23.1"
 serde = "1.0.130"
 serde_json = "1.0.68"
 structopt = "0.3.23"

cmds/install-secrets/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "nixlike"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
-dprint-core = "0.46.2"
+dprint-core = "0.50.0"
 linked-hash-map = "0.5.4"
-peg = "0.7.0"
+peg = "0.8.0"
 serde = "1.0.130"
 thiserror = "1.0.29"

crates/nixlike/Cargo.toml

@@ -4,7 +4,7 @@ name = "nixlike-fuzz"
 version = "0.0.0"
 authors = ["Automatically generated"]
 publish = false
-edition = "2018"
+edition = "2021"
 
 [package.metadata]
 cargo-fuzz = true

crates/nixlike/fuzz/Cargo.toml

@@ -1,3 +1,6 @@
+//! Serialization/deserialization for nix subset usable for static configurations
+//! Serialized results from this library are readable by both this library and standard nix tools
+
 use linked_hash_map::LinkedHashMap;
 use peg::str::LineCol;
 use se_impl::MySerialize;

crates/nixlike/src/lib.rs

@@ -15,7 +15,7 @@
           inherit system; overlays = [ (import rust-overlay) ];
         };
       llvmPkgs = pkgs.buildPackages.llvmPackages_11;
-      rust = (pkgs.rustChannelOf { date = "2021-08-16"; channel = "nightly"; }).default.override { extensions = [ "rust-src" ]; };
+      rust = (pkgs.rustChannelOf { date = "2022-02-02"; channel = "nightly"; }).default.override { extensions = [ "rust-src" ]; };
       rustPlatform = pkgs.makeRustPlatform { cargo = rust; rustc = rust; };
     in
     {