1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-08-17 23:01:04 +02:00

Merge branch 'master' into develop

This commit is contained in:
Reinout Meliesie 2024-08-04 18:31:11 +02:00
commit 3e7e7c0e94
Signed by: zedfrigg
GPG key ID: 3AFCC06481308BC6
16 changed files with 439 additions and 218 deletions

View file

@ -20,7 +20,7 @@ default = [
"ipc",
"launcher",
"music+all",
"networkmanager",
"network_manager",
"notifications",
"sys_info",
"tray",
@ -62,7 +62,7 @@ music = ["regex"]
"music+mpris" = ["music", "mpris"]
"music+mpd" = ["music", "mpd-utils"]
networkmanager = ["futures-lite", "futures-signals", "zbus"]
network_manager = ["futures-lite", "futures-signals", "zbus"]
notifications = ["zbus"]
@ -84,9 +84,9 @@ schema = ["dep:schemars"]
[dependencies]
# core
gtk = "0.18.1"
gtk-layer-shell = "0.8.0"
gtk-layer-shell = "0.8.1"
glib = "0.18.5"
tokio = { version = "1.38.0", features = [
tokio = { version = "1.39.2", features = [
"macros",
"rt-multi-thread",
"time",
@ -101,8 +101,8 @@ tracing-error = { version = "0.2.0" , default-features = false }
tracing-appender = "0.2.3"
strip-ansi-escapes = "0.2.0"
color-eyre = "0.6.3"
serde = { version = "1.0.203", features = ["derive"] }
indexmap = "2.2.6"
serde = { version = "1.0.204", features = ["derive"] }
indexmap = "2.3.0"
dirs = "5.0.1"
walkdir = "2.5.0"
notify = { version = "6.1.1", default-features = false }
@ -112,20 +112,20 @@ smithay-client-toolkit = { version = "0.18.1", default-features = false, feature
"calloop",
] }
universal-config = { version = "0.5.0", default-features = false }
ctrlc = "3.4.2"
ctrlc = "3.4.4"
cfg-if = "1.0.0"
# cli
clap = { version = "4.5.7", optional = true, features = ["derive"] }
clap = { version = "4.5.13", optional = true, features = ["derive"] }
# ipc
serde_json = { version = "1.0.117", optional = true }
serde_json = { version = "1.0.122", optional = true }
# http
reqwest = { version = "0.12.5", default-features = false, features = ["default-tls", "http2"], optional = true }
# cairo
lua-src = { version = "546.0.2", optional = true }
lua-src = { version = "547.0.0", optional = true }
mlua = { version = "0.9.9", optional = true, features = ["luajit"] }
cairo-rs = { version = "0.18.5", optional = true, features = ["png"] }
@ -139,7 +139,7 @@ chrono = { version = "0.4.38", optional = true, default-features = false, featur
mpd-utils = { version = "0.2.1", optional = true }
mpris = { version = "2.0.1", optional = true }
# networkmanager
# network_manager
futures-signals = { version = "0.3.33", optional = true }
# sys_info
@ -160,11 +160,15 @@ hyprland = { version = "0.4.0-alpha.2", features = ["silent"], optional = true }
futures-util = { version = "0.3.30", optional = true }
# shared
futures-lite = { version = "2.3.0", optional = true } # networkmanager, upower, workspaces
regex = { version = "1.10.5", default-features = false, features = [
futures-lite = { version = "2.3.0", optional = true } # network_manager, upower, workspaces
regex = { version = "1.10.6", default-features = false, features = [
"std",
], optional = true } # music, sys_info
zbus = { version = "3.15.2", default-features = false, features = ["tokio"], optional = true } # networkmanager, notifications, upower
zbus = { version = "3.15.2", default-features = false, features = ["tokio"], optional = true } # network_manager, notifications, upower
# schema
schemars = { version = "0.8.21", optional = true }
# -- PATCH --
# temp fix for tracing-appender/time
time = "0.3.36"