From 5d66497260d67c0392c0e6c9a09c6fe8ac10d43a Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 9 Dec 2023 14:00:51 +0000 Subject: [PATCH 1/3] =?UTF-8?q?memtree:=20unstable-2023-11-04=20=E2=86=92?= =?UTF-8?q?=202023-11-22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/me/memtree/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/memtree/package.nix b/pkgs/by-name/me/memtree/package.nix index 2165b46e2b48..7f7d650c422d 100644 --- a/pkgs/by-name/me/memtree/package.nix +++ b/pkgs/by-name/me/memtree/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication { pname = "memtree"; - version = "unstable-2023-11-04"; + version = "unstable-2023-11-22"; pyproject = true; src = fetchFromGitHub { owner = "nbraud"; repo = "memtree"; - rev = "093caeef26ee944b5bf4408710f63494e442b5ff"; - hash = "sha256-j4LqWy7DxeV7pjwnCfpkHwug4p48kux6BM6oDJmvuUo="; + rev = "edc09d91dcd72f175d6adc1d08b261dd95cc4fbf"; + hash = "sha256-YLZm0wjkjaTw/lHY5k4cqPXCgINe+49SGPLZq+eRdI4="; }; nativeBuildInputs = with python3Packages; [ From 1b46ab02fd39ffcf3316b2e9fbc46948e3b6a903 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 9 Dec 2023 14:04:13 +0000 Subject: [PATCH 2/3] memtree: Replace custom `checkPhase` with `pytestCheckHook` --- pkgs/by-name/me/memtree/package.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/me/memtree/package.nix b/pkgs/by-name/me/memtree/package.nix index 7f7d650c422d..bc82a9063dcf 100644 --- a/pkgs/by-name/me/memtree/package.nix +++ b/pkgs/by-name/me/memtree/package.nix @@ -18,6 +18,7 @@ python3Packages.buildPythonApplication { nativeBuildInputs = with python3Packages; [ poetry-core + pytestCheckHook ]; propagatedBuildInputs = with python3Packages; [ @@ -29,12 +30,7 @@ python3Packages.buildPythonApplication { pytest ]; - checkPhase = '' - runHook preCheck - python -m pytest -v - runHook postCheck - ''; - + pytestFlagsArray = [ "-v" ]; pythonImportChecks = [ "memtree" ]; passthru.updateScript = nix-update-script { From 4c3cb337881549b2b4464b7c1bb0827d61bd2789 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 9 Dec 2023 14:09:03 +0000 Subject: [PATCH 3/3] memtree: Add missing `mainProgram` metadata --- pkgs/by-name/me/memtree/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/me/memtree/package.nix b/pkgs/by-name/me/memtree/package.nix index bc82a9063dcf..68e990456e75 100644 --- a/pkgs/by-name/me/memtree/package.nix +++ b/pkgs/by-name/me/memtree/package.nix @@ -41,6 +41,7 @@ python3Packages.buildPythonApplication { description = "Render cgroups tree annotated by memory usage"; homepage = "https://github.com/nbraud/memtree"; maintainers = with maintainers; [ nicoo ]; + mainProgram = "memtree"; platforms = platforms.linux; }; }