Merge master into staging-next

3 files changed, 44 insertions, 4 deletions

diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix
index a9bbef0e4325..30a5b338617b 100644
--- a/pkgs/development/python-modules/bitarray/default.nix
+++ b/pkgs/development/python-modules/bitarray/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "bitarray";
-  version = "2.6.1";
+  version = "2.7.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hEClSTIh9u1sTg2csrpuTmAKX7Y59mAD6vFbcVCkkjA=";
+    hash = "sha256-ALtyPPcFnjCzKLZWizt1wPZS7JIo2VnVTpl4UqMaMaI=";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix
index a6e3f5eb9a74..e9cf439d36c1 100644
--- a/pkgs/development/python-modules/pymodbus/default.nix
+++ b/pkgs/development/python-modules/pymodbus/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "pymodbus";
-  version = "3.1.2";
+  version = "3.1.3";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "pymodbus-dev";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-kae/TADu23NnCrXkJ/dkDBNIgBm/+BxXf+lh8uMxz/s=";
+    hash = "sha256-GHyDlt046v4KP9KQRnXH6F+3ikoCjbhVHEQuSdm99a8=";
   };
 
   # Twisted asynchronous version is not supported due to a missing dependency
diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix
new file mode 100644
index 000000000000..1a8ee768fb65
--- /dev/null
+++ b/pkgs/development/python-modules/pytapo/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+
+# propagates
+, pycryptodome
+, requests
+, urllib3
+}:
+
+buildPythonPackage rec {
+  pname = "pytapo";
+  version = "2.9.2";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-LW14uDQBqIVsigOzO0bNTpjY7Fk0IWAeDMPEuWM/nOo=";
+  };
+
+  propagatedBuildInputs = [
+    pycryptodome
+    requests
+    urllib3
+  ];
+
+  pythonImportsCheck = [
+    "pytapo"
+  ];
+
+  # Tests require actual hardware
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Python library for communication with Tapo Cameras ";
+    homepage = "https://github.com/JurajNyiri/pytapo";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fleaz ];
+  };
+}