From 878d18373fa562ec5df40ff2327071b9633693da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 27 May 2025 18:55:13 +0200 Subject: [PATCH 1/5] dwm-status: add update script --- pkgs/applications/window-managers/dwm/dwm-status.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 3019ab156fb1..65291d78ef9c 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -15,6 +15,7 @@ dnsutils, iproute2, wirelesstools, + nix-update-script, }: let @@ -59,6 +60,8 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/dwm-status --prefix "PATH" : "${lib.makeBinPath bins}" ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Highly performant and configurable DWM status service"; homepage = "https://github.com/Gerschtli/dwm-status"; From 7cc1d50d5fa7809087d7dfa8919d116469ba08c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 27 May 2025 16:55:52 +0000 Subject: [PATCH 2/5] dwm-status: 1.9.0 -> 1.10.0 --- pkgs/applications/window-managers/dwm/dwm-status.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 65291d78ef9c..b14d6f735f87 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -33,13 +33,13 @@ in rustPlatform.buildRustPackage rec { pname = "dwm-status"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "Gerschtli"; repo = pname; rev = version; - sha256 = "sha256-OFwI4evwbXLO4ufjrh5SZia79bwbAKVoSm/IPCDku68="; + sha256 = "sha256-982JFYZroskKppAOZjBWOFt624FfRjhXpYN57s/cM50="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-G31p8iVRUODD4hUssXaOqEOUTW+C+GZMy/L/tgumDtA="; + cargoHash = "sha256-2/zzE6JzhqeBYLiRkx5ELaW150rk1bMTrpxSw/wxNes="; postInstall = lib.optionalString (bins != [ ]) '' wrapProgram $out/bin/dwm-status --prefix "PATH" : "${lib.makeBinPath bins}" From eb3cf54d27e61d3f20b55c826608acee20e3ea7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 27 May 2025 18:57:57 +0200 Subject: [PATCH 3/5] dwm-status: refactor --- .../window-managers/dwm/dwm-status.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index b14d6f735f87..385485fafbed 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -38,8 +38,8 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "Gerschtli"; repo = pname; - rev = version; - sha256 = "sha256-982JFYZroskKppAOZjBWOFt624FfRjhXpYN57s/cM50="; + tag = version; + hash = "sha256-982JFYZroskKppAOZjBWOFt624FfRjhXpYN57s/cM50="; }; nativeBuildInputs = [ @@ -62,13 +62,13 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Highly performant and configurable DWM status service"; homepage = "https://github.com/Gerschtli/dwm-status"; - changelog = "https://github.com/Gerschtli/dwm-status/blob/master/CHANGELOG.md"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ gerschtli ]; + changelog = "https://github.com/Gerschtli/dwm-status/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gerschtli ]; mainProgram = "dwm-status"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } From 834d6bd5fca28202cd5d6b1966000dbfce04c6a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 27 May 2025 19:27:53 +0200 Subject: [PATCH 4/5] dwm-status: add maintainer gepbird --- pkgs/applications/window-managers/dwm/dwm-status.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 385485fafbed..0da73c866772 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -67,7 +67,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Gerschtli/dwm-status"; changelog = "https://github.com/Gerschtli/dwm-status/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ gerschtli ]; + maintainers = with lib.maintainers; [ + gepbird + gerschtli + ]; mainProgram = "dwm-status"; platforms = lib.platforms.linux; }; From 798d6e76cfa80ddc9d971921e7949b9aaf4bd2fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 27 May 2025 18:59:36 +0200 Subject: [PATCH 5/5] nixos/dwm-status: run with --quiet --- nixos/modules/services/misc/dwm-status.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/dwm-status.nix b/nixos/modules/services/misc/dwm-status.nix index ce2fc4249314..f0df70051d48 100644 --- a/nixos/modules/services/misc/dwm-status.nix +++ b/nixos/modules/services/misc/dwm-status.nix @@ -69,7 +69,7 @@ in wantedBy = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ]; - serviceConfig.ExecStart = "${cfg.package}/bin/dwm-status ${configFile}"; + serviceConfig.ExecStart = "${cfg.package}/bin/dwm-status ${configFile} --quiet"; }; };