diff --git a/Cargo.lock b/Cargo.lock index ec413967d..6c64f8c63 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -396,9 +396,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cfg_aliases" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "cgroups-rs" @@ -636,16 +636,15 @@ checksum = "a74858bcfe44b22016cb49337d7b6f04618c58e5dbfdef61b06b8c434324a0bc" [[package]] name = "curve25519-dalek" -version = "4.0.0" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f711ade317dd348950a9910f81c5947e3d8907ebd2b83f76203ff1807e6a2bc2" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest", "fiat-crypto", - "platforms", "rustc_version", "subtle", "zeroize", @@ -900,9 +899,9 @@ version = "0.0.1" [[package]] name = "fiat-crypto" -version = "0.1.20" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "fnv" @@ -1237,9 +1236,9 @@ dependencies = [ [[package]] name = "inotify" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf888f9575c290197b2c948dc9e9ff10bd1a39ad1ea8585f734585fa6b9d3f9" +checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" dependencies = [ "bitflags 1.3.2", "futures-core", @@ -1262,7 +1261,7 @@ name = "inspect" version = "0.0.1" dependencies = [ "caps", - "nix 0.28.0", + "nix 0.29.0", ] [[package]] @@ -1498,9 +1497,9 @@ dependencies = [ [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ "bitflags 2.4.2", "cfg-if", @@ -1529,7 +1528,7 @@ dependencies = [ "clap 4.4.18", "console 0.15.7", "log", - "nix 0.28.0", + "nix 0.29.0", "northstar-runtime", "serde", "time", @@ -1603,7 +1602,7 @@ dependencies = [ "memfd", "memoffset", "nanoid", - "nix 0.28.0", + "nix 0.29.0", "pkg-version", "proptest", "rand_core", @@ -1674,7 +1673,7 @@ dependencies = [ "log", "memfd", "nanoid", - "nix 0.28.0", + "nix 0.29.0", "northstar-client", "northstar-runtime", "northstar-tests-derive", @@ -1845,12 +1844,6 @@ dependencies = [ "proc-macro-hack", ] -[[package]] -name = "platforms" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" - [[package]] name = "powerfmt" version = "0.2.0" @@ -2511,7 +2504,7 @@ dependencies = [ "anyhow", "caps", "clap 4.4.18", - "nix 0.28.0", + "nix 0.29.0", "socket2", ] diff --git a/Cargo.toml b/Cargo.toml index 28236f5d7..d71ab4686 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "Apache-2.0" readme = "README.md" repository = "https://github.com/esrlabs/northstar" -rust-version = "1.65.0" +rust-version = "1.70.0" [workspace] members = [ diff --git a/cargo-npk/Cargo.toml b/cargo-npk/Cargo.toml index 06f2ed894..4af98cdd1 100644 --- a/cargo-npk/Cargo.toml +++ b/cargo-npk/Cargo.toml @@ -10,9 +10,8 @@ rust-version.workspace = true [dependencies] anyhow = "1.0.80" -atty = "0.2.14" cargo-subcommand = { version = "0.12.0", features = ["clap"] } -cargo_metadata = "0.15.3" +cargo_metadata = "0.18.1" clap = { version = "4.4.18", features = ["derive"] } human_bytes = "0.4.3" humantime = "2.1.0" diff --git a/cargo-npk/src/cli.rs b/cargo-npk/src/cli.rs index 90a5d13e2..5de41adc1 100644 --- a/cargo-npk/src/cli.rs +++ b/cargo-npk/src/cli.rs @@ -65,7 +65,7 @@ impl Display for Compression { #[group(skip)] #[allow(clippy::large_enum_variant)] pub enum NpkSubCommand { - /// Compile the current package and create an apk + /// Compile the current package and create a npk Pack { #[clap(flatten)] args: Args, @@ -91,6 +91,6 @@ pub enum NpkSubCommand { #[clap(long("out"))] out: Option, }, - /// Print the version of cargo-apk + /// Print the version of cargo-npk Version, } diff --git a/cargo-npk/src/lib.rs b/cargo-npk/src/lib.rs index 4fb3580f7..9acfd588c 100644 --- a/cargo-npk/src/lib.rs +++ b/cargo-npk/src/lib.rs @@ -23,6 +23,8 @@ use northstar_runtime::npk::npk::{NpkBuilder, SquashfsOptions}; use crate::metadata::Metadata; +use std::io::IsTerminal; + mod cli; mod metadata; @@ -307,7 +309,7 @@ fn stdout(choice: ColorChoice) -> StandardStream { ColorChoice::Always => termcolor::ColorChoice::Always, ColorChoice::Never => termcolor::ColorChoice::AlwaysAnsi, ColorChoice::Auto => { - if atty::is(atty::Stream::Stdout) { + if std::io::stdout().is_terminal() { termcolor::ColorChoice::Auto } else { termcolor::ColorChoice::Never