From 62e632d4308bf7a8e896a1af10e5a88db0d2f326 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Fri, 26 Jul 2024 18:29:59 -0400 Subject: [PATCH] python312Packages.cgroup-utils: remove nose dependency and modernize --- .../python-modules/cgroup-utils/default.nix | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix index 89b05b5f34080..17047a3213893 100644 --- a/pkgs/development/python-modules/cgroup-utils/default.nix +++ b/pkgs/development/python-modules/cgroup-utils/default.nix @@ -2,25 +2,13 @@ lib, buildPythonPackage, fetchFromGitHub, - pep8, - nose, + setuptools, }: buildPythonPackage rec { - version = "0.8"; - format = "setuptools"; pname = "cgroup-utils"; - - buildInputs = [ - pep8 - nose - ]; - # Pep8 tests fail... - doCheck = false; - - postPatch = '' - sed -i -e "/argparse/d" setup.py - ''; + version = "0.8"; + pyproject = true; src = fetchFromGitHub { owner = "peo3"; @@ -29,11 +17,25 @@ buildPythonPackage rec { sha256 = "0qnbn8cnq8m14s8s1hcv25xjd55dyb6yy54l5vc7sby5xzzp11fq"; }; - meta = with lib; { + postPatch = '' + sed -i -e "/argparse/d" setup.py + ''; + + build-system = [ setuptools ]; + + # Upon running `from cgutils import cgroup`, it attempts to read a file in `/sys`. + # Due to the Nix build sandbox, this is disallowed, and so all possible tests fail, + # so we don't run them. Plain `import cgutils` works, so we run pythonImportsCheck below. + doCheck = false; + + pythonImportsCheck = [ "cgutils" ]; + + meta = { description = "Utility tools for control groups of Linux"; + homepage = "https://github.com/peo3/cgroup-utils"; mainProgram = "cgutil"; - maintainers = with maintainers; [ layus ]; - platforms = platforms.linux; - license = licenses.gpl2; + maintainers = with lib.maintainers; [ layus ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; }; }