From 802799f07b9ccf4efe47d65166c21e1575977c02 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Mar 2025 16:43:35 +0100 Subject: [PATCH 1/2] python312Packages.ssdp: migrate to pytest-cov-stub --- pkgs/development/python-modules/ssdp/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index c34c46c7c08c..7bf148a7eca8 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, flit-core, flit-scm, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -22,17 +23,15 @@ buildPythonPackage rec { hash = "sha256-mORjMEg7Q/2CKZBLICSGF8dcdl98S6mBgJ4jujPGs6M="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "--cov" "" - ''; - nativeBuildInputs = [ flit-core flit-scm ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "ssdp" ]; From 687ff067c2187794fbda872ca7f3a8531c9e1f80 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Mar 2025 17:13:02 +0100 Subject: [PATCH 2/2] python312Packages.ssdp: refactor and add optional dependencies --- .../python-modules/ssdp/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index 7bf148a7eca8..270fb07362a2 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -1,9 +1,11 @@ { lib, buildPythonPackage, + click, fetchFromGitHub, flit-core, flit-scm, + pygments, pytest-cov-stub, pytestCheckHook, pythonOlder, @@ -12,22 +14,30 @@ buildPythonPackage rec { pname = "ssdp"; version = "1.3.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "codingjoe"; - repo = pname; + repo = "ssdp"; tag = version; hash = "sha256-mORjMEg7Q/2CKZBLICSGF8dcdl98S6mBgJ4jujPGs6M="; }; - nativeBuildInputs = [ + build-system = [ flit-core flit-scm ]; + optional-dependencies = { + cli = [ + click + pygments + ]; + pygments = [ pygments ]; + }; + nativeCheckInputs = [ pytest-cov-stub pytestCheckHook @@ -37,10 +47,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python asyncio library for Simple Service Discovery Protocol (SSDP)"; - mainProgram = "ssdp"; homepage = "https://github.com/codingjoe/ssdp"; changelog = "https://github.com/codingjoe/ssdp/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "ssdp"; }; }