diff --git a/pkgs/development/python-modules/coq-tools/default.nix b/pkgs/development/python-modules/coq-tools/default.nix index e788bafafec3..b2e962f62743 100644 --- a/pkgs/development/python-modules/coq-tools/default.nix +++ b/pkgs/development/python-modules/coq-tools/default.nix @@ -1,25 +1,32 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, + pytestCheckHook, + subprocess4, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "coq-tools"; - version = "0.0.42"; + version = "0.0.44"; pyproject = true; - src = fetchPypi { - pname = "coq_tools"; - inherit version; - hash = "sha256-d+SAGmZKUQo2ZKuC91r/2RHDvi5GCIKGTxcuau1kN0U="; + src = fetchFromGitHub { + owner = "JasonGross"; + repo = "coq-tools"; + tag = "v${finalAttrs.version}"; + hash = "sha256-2WMxJkLGfMtXu4ZpIuS1wIXMvgJbCMy2eY8qz5+v9LI="; }; build-system = [ setuptools ]; + dependencies = [ subprocess4 ]; + pythonImportsCheck = [ "coq_tools" ]; + nativeCheckInputs = [ pytestCheckHook ]; + meta = { description = "Tools for working with Coq proof assistant"; homepage = "https://pypi.org/project/coq-tools/"; @@ -27,4 +34,4 @@ buildPythonPackage rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/development/python-modules/subprocess4/default.nix b/pkgs/development/python-modules/subprocess4/default.nix new file mode 100644 index 000000000000..4c69d925c060 --- /dev/null +++ b/pkgs/development/python-modules/subprocess4/default.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "subprocess4"; + version = "0.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "JasonGross"; + repo = "subprocess4"; + tag = "v${finalAttrs.version}"; + hash = "sha256-On0mUc5DLktlaVSK/7VcEKRG1dnmYHNRSe149BnoIAk="; + }; + + build-system = [ + hatchling + ]; + + pythonImportsCheck = [ + "subprocess4" + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Python subprocess wrapper using os.wait4 to get resource usage"; + homepage = "https://github.com/JasonGross/subprocess4"; + changelog = "https://github.com/JasonGross/subprocess4/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ moraxyc ]; + platforms = lib.platforms.unix; # require posix + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9f19caec07a3..17f93ff77f23 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19021,6 +19021,8 @@ self: super: with self; { subprocess-tee = callPackage ../development/python-modules/subprocess-tee { }; + subprocess4 = callPackage ../development/python-modules/subprocess4 { }; + subunit = callPackage ../development/python-modules/subunit { inherit (pkgs) subunit cppunit check; };