From c47294a99e6cc5b2f4919e43783e1fc4798f60bf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 18 Jul 2024 00:07:01 +0200 Subject: [PATCH 1/2] python312Packages.uvcclient: 0.11.0 -> 0.11.1 https://github.com/kk7ds/uvcclient/compare/0.11.0...0.11.1 --- .../python-modules/uvcclient/default.nix | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/uvcclient/default.nix b/pkgs/development/python-modules/uvcclient/default.nix index c884e3a02926..42f89f8d02fa 100644 --- a/pkgs/development/python-modules/uvcclient/default.nix +++ b/pkgs/development/python-modules/uvcclient/default.nix @@ -2,21 +2,21 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, - nose, + setuptools, mock, + pytestCheckHook }: buildPythonPackage rec { pname = "uvcclient"; - version = "0.11.0"; - format = "setuptools"; + version = "0.11.1"; + pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = pname; - rev = "58e7a53815482b7778481f81cde95f53a60bb6f6"; - sha256 = "0k8aswrk1n08w6pi6dg0zdzsmk23cafihkrss9ywg3i85w7q43x2"; + rev = "refs/tags/${version}"; + hash = "sha256-0OUdBygL2AAtccL5hdyL+0PIRK4o+lNN3droWDysDeI="; }; postPatch = '' @@ -24,18 +24,13 @@ buildPythonPackage rec { --replace-fail "assertEquals" "assertEqual" ''; - # tests rely on nose - doCheck = pythonOlder "3.12"; + build-system = [ setuptools ]; nativeCheckInputs = [ - nose mock + pytestCheckHook ]; - checkPhase = '' - nosetests - ''; - meta = with lib; { description = "Client for Ubiquiti's Unifi Camera NVR"; mainProgram = "uvc"; From 0e029f1d19e88e8feb291acd6433c60e81f4c81f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 18 Jul 2024 00:20:27 +0200 Subject: [PATCH 2/2] python312Packages.uiprotect: 5.2.2 -> 5.3.0 https://github.com/uilibs/uiprotect/blob/refs/tags/v5.3.0/CHANGELOG.md --- pkgs/development/python-modules/uiprotect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index ccbd1a82f1c6..826f5fd4fcb8 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "uiprotect"; - version = "5.2.2"; + version = "5.3.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "uilibs"; repo = "uiprotect"; rev = "refs/tags/v${version}"; - hash = "sha256-XWsb/sEXJynb8NEdSm9LMPKTZbacwYHHTUaol1nR3kM="; + hash = "sha256-3+et24rvB9wh1cvUOXtgeDkh+SI0+dOrEnFBH5g735o="; }; postPatch = ''