diff --git a/Cargo.lock b/Cargo.lock index 37e83740..ac4dbceb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -882,7 +882,6 @@ dependencies = [ "i18n-embed-fl", "itertools", "libcosmic", - "nix 0.28.0", "once_cell", "rand", "ron", @@ -1022,7 +1021,6 @@ dependencies = [ "i18n-embed", "i18n-embed-fl", "libcosmic", - "nix 0.28.0", "ron", "rust-embed", "rust-embed-utils", @@ -1045,10 +1043,10 @@ dependencies = [ "libpulse-binding", "libpulse-glib-binding", "logind-zbus", - "nix 0.28.0", "once_cell", "rust-embed", "rust-embed-utils", + "rustix 0.38.31", "tokio", "tracing", "tracing-log", @@ -1098,7 +1096,6 @@ dependencies = [ "i18n-embed", "i18n-embed-fl", "libcosmic", - "nix 0.28.0", "once_cell", "rust-embed", "tokio", @@ -1118,7 +1115,6 @@ dependencies = [ "i18n-embed", "i18n-embed-fl", "libcosmic", - "nix 0.28.0", "once_cell", "rust-embed", "tokio", @@ -3673,18 +3669,6 @@ dependencies = [ "libc", ] -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.4.2", - "cfg-if", - "cfg_aliases 0.1.1", - "libc", -] - [[package]] name = "notify" version = "6.1.1" diff --git a/Cargo.toml b/Cargo.toml index 7008aca8..cd6a1e69 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,9 +41,9 @@ libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = fa "desktop", "dbus-config", ] } -nix = { version = "0.28.0", features = ["user"] } rust-embed = "8.3" rust-embed-utils = "8.3.0" +rustix = { version = "0.38", features = ["fs", "process"] } zbus = { version = "3.15", default-features = false, features = ["tokio"] } tracing = "0.1" tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } diff --git a/cosmic-app-list/Cargo.toml b/cosmic-app-list/Cargo.toml index ecbd689f..03035faa 100644 --- a/cosmic-app-list/Cargo.toml +++ b/cosmic-app-list/Cargo.toml @@ -14,7 +14,6 @@ i18n-embed.workspace = true i18n-embed-fl.workspace = true itertools = "0.12.1" libcosmic.workspace = true -nix.workspace = true once_cell = "1.19" rand = "0.8.5" ron = "0.8" diff --git a/cosmic-applet-minimize/Cargo.toml b/cosmic-applet-minimize/Cargo.toml index a534f472..38d76366 100644 --- a/cosmic-applet-minimize/Cargo.toml +++ b/cosmic-applet-minimize/Cargo.toml @@ -16,7 +16,7 @@ once_cell = "1" png = "0.17.13" rust-embed-utils.workspace = true rust-embed.workspace = true -rustix = { version = "0.38.31", features = ["fs"] } +rustix.workspace = true tempfile = "3.10.1" tokio = { version = "1.36.0", features = ["sync", "macros"] } tracing-log.workspace = true diff --git a/cosmic-applet-notifications/Cargo.toml b/cosmic-applet-notifications/Cargo.toml index 3a1a2aa7..022e0e4a 100644 --- a/cosmic-applet-notifications/Cargo.toml +++ b/cosmic-applet-notifications/Cargo.toml @@ -8,7 +8,6 @@ license = "GPL-3.0-or-later" anyhow.workspace = true cosmic-time.workspace = true libcosmic.workspace = true -nix.workspace = true tokio = { version = "1.36.0", features = [ "sync", "rt", diff --git a/cosmic-applet-power/Cargo.toml b/cosmic-applet-power/Cargo.toml index 54914a3b..355504ee 100644 --- a/cosmic-applet-power/Cargo.toml +++ b/cosmic-applet-power/Cargo.toml @@ -11,10 +11,10 @@ libcosmic.workspace = true libpulse-binding = "2.28.1" libpulse-glib-binding = "2.28.1" logind-zbus = "3.1" -nix.workspace = true once_cell = "1.19.0" rust-embed-utils.workspace = true rust-embed.workspace = true +rustix.workspace = true tokio = { version = "1.36.0", features=["full"] } tracing-log.workspace = true tracing-subscriber.workspace = true diff --git a/cosmic-applet-power/src/lib.rs b/cosmic-applet-power/src/lib.rs index 23febcfe..b97899a3 100644 --- a/cosmic-applet-power/src/lib.rs +++ b/cosmic-applet-power/src/lib.rs @@ -31,7 +31,7 @@ use cosmic::{app::Command, Element, Theme}; use logind_zbus::manager::ManagerProxy; use logind_zbus::session::{SessionProxy, SessionType}; use logind_zbus::user::UserProxy; -use nix::unistd::getuid; +use rustix::process::getuid; use zbus::Connection; pub mod cosmic_session; diff --git a/cosmic-applet-time/Cargo.toml b/cosmic-applet-time/Cargo.toml index 104475eb..a4718cd2 100644 --- a/cosmic-applet-time/Cargo.toml +++ b/cosmic-applet-time/Cargo.toml @@ -9,7 +9,6 @@ chrono = { version = "0.4.35", features = ["clock"] } i18n-embed-fl.workspace = true i18n-embed.workspace = true libcosmic.workspace = true -nix.workspace = true once_cell = "1" rust-embed.workspace = true tokio = { version = "1.36.0", features = ["time"] } diff --git a/cosmic-applet-workspaces/Cargo.toml b/cosmic-applet-workspaces/Cargo.toml index a57b94af..b8598079 100644 --- a/cosmic-applet-workspaces/Cargo.toml +++ b/cosmic-applet-workspaces/Cargo.toml @@ -8,7 +8,6 @@ edition = "2021" libcosmic.workspace = true cctk.workspace = true cosmic-protocols.workspace = true -nix.workspace = true tracing.workspace = true tracing-subscriber.workspace = true tracing-log.workspace = true