From 74f82ab78facdb7c120361eccbabf8b013fc769c Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 10 May 2024 04:41:35 +0200 Subject: [PATCH 1/3] ps_mem: add sigmanificient to maintainers fix name --- pkgs/tools/system/ps_mem/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix index 96c21e461d4a..67d4ba974fdb 100644 --- a/pkgs/tools/system/ps_mem/default.nix +++ b/pkgs/tools/system/ps_mem/default.nix @@ -14,9 +14,9 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "A utility to accurately report the in core memory usage for a program"; homepage = "https://github.com/pixelb/ps_mem"; - license = licenses.lgpl21; - maintainers = [ ]; - platforms = platforms.linux; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ sigmanificient ]; + platforms = lib.platforms.linux; mainProgram = "ps_mem"; }; } From c76fab5a68b4fcf69591bb6a29d381df2e73994a Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 10 May 2024 04:42:34 +0200 Subject: [PATCH 2/3] ps_mem: 3.13 -> 3.14 --- pkgs/tools/system/ps_mem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix index 67d4ba974fdb..a50a2ef058e6 100644 --- a/pkgs/tools/system/ps_mem/default.nix +++ b/pkgs/tools/system/ps_mem/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "ps_mem"; - version = "3.13"; + version = "3.14"; src = fetchFromGitHub { owner = "pixelb"; repo = pname; rev = "v${version}"; - sha256 = "0pgi9hvwfbkzvwicqlkwx4rwal1ikza018yxbwpnf7c80zw0zaw9"; + hash = "sha256-jCfPtPSky/QFk9Xo/tq3W7609Pie1yLC4iS4dqjCa+E="; }; meta = with lib; { From dc2ed8cac406047862bae5e290ad11e0f3c37319 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 10 May 2024 04:45:43 +0200 Subject: [PATCH 3/3] ps_mem: migrate to by-name --- .../ps_mem/default.nix => by-name/ps/ps_mem/package.nix} | 8 ++++++-- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 6 insertions(+), 4 deletions(-) rename pkgs/{tools/system/ps_mem/default.nix => by-name/ps/ps_mem/package.nix} (89%) diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/by-name/ps/ps_mem/package.nix similarity index 89% rename from pkgs/tools/system/ps_mem/default.nix rename to pkgs/by-name/ps/ps_mem/package.nix index a50a2ef058e6..c6cdbab67262 100644 --- a/pkgs/tools/system/ps_mem/default.nix +++ b/pkgs/by-name/ps/ps_mem/package.nix @@ -1,4 +1,8 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ + lib, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonApplication rec { pname = "ps_mem"; @@ -11,7 +15,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-jCfPtPSky/QFk9Xo/tq3W7609Pie1yLC4iS4dqjCa+E="; }; - meta = with lib; { + meta = { description = "A utility to accurately report the in core memory usage for a program"; homepage = "https://github.com/pixelb/ps_mem"; license = lib.licenses.lgpl21; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a38897c6125b..04e73aa5b600 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6127,8 +6127,6 @@ with pkgs; poweralertd = callPackage ../tools/misc/poweralertd { }; - ps_mem = callPackage ../tools/system/ps_mem { }; - pscale = callPackage ../development/tools/pscale { }; pulsarctl = callPackage ../tools/admin/pulsarctl { };