Merge pull request #328041 from mweinelt/unifi-video-stuff

python312Packages.uvcclient: 0.11.0 -> 0.11.1; python312Packages.uiprotect: 5.2.2 -> 5.3.0
NixOS · Jul 17, 2024 · ede8a2b · ede8a2b
2 parents 4a8aba6 + 0e029f1
commit ede8a2b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git 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 = ''

diff --git a/pkgs/development/python-modules/uvcclient/default.nix b/pkgs/development/python-modules/uvcclient/default.nix
@@ -2,40 +2,35 @@
   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 = ''
     substituteInPlace tests/test_camera.py \
       --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";