From d678f570f0db627853794fe1a732208cfe97d659 Mon Sep 17 00:00:00 2001 From: airone01 Date: Sun, 24 May 2026 23:25:24 +0200 Subject: [PATCH 1/2] psrecord: 1.2 -> 1.4 --- pkgs/tools/misc/psrecord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/psrecord/default.nix b/pkgs/tools/misc/psrecord/default.nix index 8ad799f85d67..53a14136e88d 100644 --- a/pkgs/tools/misc/psrecord/default.nix +++ b/pkgs/tools/misc/psrecord/default.nix @@ -8,12 +8,12 @@ }: buildPythonApplication rec { pname = "psrecord"; - version = "1.2"; + version = "1.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "5d48410e543b71e5dc4677705acc2a753db65814d3ccbdfbca8d5d3a09b053b1"; + sha256 = "sha256-WXcYVIi1ZwI5xziVGcqEy5BN3fEQH/825EWJjYcUVLE="; }; propagatedBuildInputs = [ From 773fcd0f36b0d9c356318a57b0da7948bb0ccfa5 Mon Sep 17 00:00:00 2001 From: airone01 Date: Sun, 24 May 2026 23:51:27 +0200 Subject: [PATCH 2/2] psrecord: move to pkgs/by-name Assisted-by: Claude Sonnet 4.6 --- .../ps/psrecord/package.nix} | 22 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 12 insertions(+), 12 deletions(-) rename pkgs/{tools/misc/psrecord/default.nix => by-name/ps/psrecord/package.nix} (64%) diff --git a/pkgs/tools/misc/psrecord/default.nix b/pkgs/by-name/ps/psrecord/package.nix similarity index 64% rename from pkgs/tools/misc/psrecord/default.nix rename to pkgs/by-name/ps/psrecord/package.nix index 53a14136e88d..ed33f2b67153 100644 --- a/pkgs/tools/misc/psrecord/default.nix +++ b/pkgs/by-name/ps/psrecord/package.nix @@ -1,27 +1,29 @@ { lib, - buildPythonApplication, fetchPypi, - psutil, - matplotlib, - pytest, + python3Packages, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "psrecord"; version = "1.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "sha256-WXcYVIi1ZwI5xziVGcqEy5BN3fEQH/825EWJjYcUVLE="; }; - propagatedBuildInputs = [ + build-system = with python3Packages; [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = with python3Packages; [ psutil matplotlib ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3Packages; [ pytest ]; @@ -38,4 +40,4 @@ buildPythonApplication rec { maintainers = with lib.maintainers; [ johnazoidberg ]; mainProgram = "psrecord"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bcb43e25305c..e993b308bcd0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1851,8 +1851,6 @@ with pkgs; pixcat = with python3Packages; toPythonApplication pixcat; - psrecord = python3Packages.callPackage ../tools/misc/psrecord { }; - remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { }; ropgadget = with python3Packages; toPythonApplication ropgadget;