From f0ae75c5369a6657738ba031d3db2819692bf6b0 Mon Sep 17 00:00:00 2001 From: Hendrik Sokolowski Date: Fri, 25 Oct 2024 21:52:59 +0200 Subject: [PATCH 1/3] maintainers: add hensoko (cherry picked from commit f40c74785ce3ddfcb4ddd62e4d4f44237e75a528) --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1ef6719421922..541ca4f47acf0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7859,6 +7859,12 @@ githubId = 6430643; name = "Henry Till"; }; + hensoko = { + email = "hensoko@pub.solar"; + github = "hensoko"; + githubId = 13552930; + name = "hensoko"; + }; heph2 = { email = "srht@mrkeebs.eu"; github = "heph2"; From bff01776a93271d75cd7d328005594635f9118b6 Mon Sep 17 00:00:00 2001 From: Hendrik Sokolowski Date: Fri, 25 Oct 2024 21:53:40 +0200 Subject: [PATCH 2/3] sysstat: adopt (cherry picked from commit 3db12634018c7ecb0267a022f220df2142e76817) --- pkgs/os-specific/linux/sysstat/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 303935d8adb44..038e0375f5bba 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { description = "A collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ lib.maintainers.hensoko ]; }; } From 300edfda4034ea2552ddac3c883d30ebdd6f4c67 Mon Sep 17 00:00:00 2001 From: Hendrik Sokolowski Date: Fri, 25 Oct 2024 21:56:14 +0200 Subject: [PATCH 3/3] sysstat: add iostat as mainProgram (cherry picked from commit f251273e4174dfd2b500b7691ac85416af174a36) --- pkgs/os-specific/linux/sysstat/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 038e0375f5bba..566746fe8bc44 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { patches = [ ./install.patch ]; meta = { + mainProgram = "iostat"; homepage = "http://sebastien.godard.pagesperso-orange.fr/"; description = "A collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)"; license = lib.licenses.gpl2Plus;