From 28be4b7173b43e7720b7ffa677bb6f8cdbf59a18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 21:32:02 +0000 Subject: [PATCH 1/3] python311Packages.pyezviz: 0.2.2.3 -> 0.2.2.4 --- pkgs/development/python-modules/pyezviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index 1f3f6662f386..1938063a671a 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.2.2.3"; + version = "0.2.2.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "baqs"; repo = "pyEzviz"; rev = "refs/tags/${version}"; - hash = "sha256-HZLWpoo0luAqqwLA3t7cDh0yVP6znrzMoUg7cuexd28="; + hash = "sha256-ngQu9g0qvJ3zDaTdGqJDGRoMhnGYdp5jHDoPiuXOwGs="; }; propagatedBuildInputs = [ From 28d0b9899e278cae02d3d2b94603c960037464bf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 May 2024 08:53:32 +0200 Subject: [PATCH 2/3] python311Packages.pyezviz: refactor --- pkgs/development/python-modules/pyezviz/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index 1938063a671a..eafd6afc5320 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -6,15 +6,16 @@ , pycryptodome , pythonOlder , requests +, setuptools , xmltodict }: buildPythonPackage rec { pname = "pyezviz"; version = "0.2.2.4"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "baqs"; @@ -23,7 +24,11 @@ buildPythonPackage rec { hash = "sha256-ngQu9g0qvJ3zDaTdGqJDGRoMhnGYdp5jHDoPiuXOwGs="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ paho-mqtt pandas pycryptodome @@ -40,10 +45,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface for for Ezviz cameras"; - mainProgram = "pyezviz"; homepage = "https://github.com/baqs/pyEzviz/"; changelog = "https://github.com/BaQs/pyEzviz/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "pyezviz"; }; } From ad1468bf958f8bf903dea2910bc3fe96adbf664a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 May 2024 08:54:10 +0200 Subject: [PATCH 3/3] python311Packages.pyezviz: format with nixfmt --- .../python-modules/pyezviz/default.nix | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index eafd6afc5320..43fd100d7ce0 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -1,13 +1,14 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, paho-mqtt -, pandas -, pycryptodome -, pythonOlder -, requests -, setuptools -, xmltodict +{ + lib, + buildPythonPackage, + fetchFromGitHub, + paho-mqtt, + pandas, + pycryptodome, + pythonOlder, + requests, + setuptools, + xmltodict, }: buildPythonPackage rec { @@ -24,9 +25,7 @@ buildPythonPackage rec { hash = "sha256-ngQu9g0qvJ3zDaTdGqJDGRoMhnGYdp5jHDoPiuXOwGs="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ paho-mqtt @@ -39,9 +38,7 @@ buildPythonPackage rec { # Project has no tests. test_cam_rtsp.py is more a sample for using the module doCheck = false; - pythonImportsCheck = [ - "pyezviz" - ]; + pythonImportsCheck = [ "pyezviz" ]; meta = with lib; { description = "Python interface for for Ezviz cameras";