diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2024-07-18 01:24:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-18 01:24:22 +0200 |
| commit | ede8a2b8473fae013cfc0cca9400a8fcbd7cc021 (patch) | |
| tree | 8218cf014325d783e4db0b6adcc24bc0191618b9 /pkgs/development/python-modules | |
| parent | 4a8aba6a4a589256f7a2b0066418964b011caf81 (diff) | |
| parent | 0e029f1d19e88e8feb291acd6433c60e81f4c81f (diff) | |
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
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/uiprotect/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/uvcclient/default.nix | 21 |
2 files changed, 10 insertions, 15 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 = '' 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"; |