Merge master into staging-next

4 files changed, 102 insertions, 4 deletions

diff --git a/pkgs/development/python-modules/avion/default.nix b/pkgs/development/python-modules/avion/default.nix
new file mode 100644
index 000000000000..a456c110ff42
--- /dev/null
+++ b/pkgs/development/python-modules/avion/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, bluepy
+, buildPythonPackage
+, csrmesh
+, fetchPypi
+, pycryptodome
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "avion";
+  version = "0.10";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0zgv45086b97ngyqxdp41wxb7hpn9g7alygc21j9y3dib700vzdz";
+  };
+
+  propagatedBuildInputs = [
+    bluepy
+    csrmesh
+    pycryptodome
+    requests
+  ];
+
+  # Project has no test
+  doCheck = false;
+  # bluepy/uuids.json is not found
+  # pythonImportsCheck = [ "avion" ];
+
+  meta = with lib; {
+    description = "Python API for controlling Avi-on Bluetooth dimmers";
+    homepage = "https://github.com/mjg59/python-avion";
+    license = with licenses; [ gpl3Plus ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/development/python-modules/bluepy-devices/default.nix b/pkgs/development/python-modules/bluepy-devices/default.nix
new file mode 100644
index 000000000000..c1baeedcb5e4
--- /dev/null
+++ b/pkgs/development/python-modules/bluepy-devices/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, bluepy
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "bluepy-devices";
+  version = "0.2.1";
+
+  src = fetchPypi {
+    pname = "bluepy_devices";
+    inherit  version;
+    sha256 = "02zzzivxq2vifgs65m2rm8pqlsbzsbc419c032irzvfxjx539mr8";
+  };
+
+  propagatedBuildInputs = [ bluepy ];
+
+  # Project has no test
+  doCheck = false;
+  pythonImportsCheck = [ "bluepy_devices" ];
+
+  meta = with lib; {
+    description = "Python BTLE Device Interface for bluepy";
+    homepage = "https://github.com/bimbar/bluepy_devices";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/development/python-modules/csrmesh/default.nix b/pkgs/development/python-modules/csrmesh/default.nix
new file mode 100644
index 000000000000..142756341567
--- /dev/null
+++ b/pkgs/development/python-modules/csrmesh/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, bluepy
+, buildPythonPackage
+, fetchPypi
+, pycryptodomex
+}:
+
+buildPythonPackage rec {
+  pname = "csrmesh";
+  version = "0.10.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "03lzam54ypcfvqvikh3gsrivvlidmz1ifdq15xv8c5i3n5b178ag";
+  };
+
+  propagatedBuildInputs = [
+    bluepy
+    pycryptodomex
+  ];
+
+  # Project has no test
+  doCheck = false;
+  pythonImportsCheck = [ "csrmesh" ];
+
+  meta = with lib; {
+    description = "Python implementation of the CSRMesh bridge protocol";
+    homepage = "https://github.com/nkaminski/csrmesh";
+    license = with licenses; [ lgpl3Only ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/development/python-modules/pyiqvia/default.nix b/pkgs/development/python-modules/pyiqvia/default.nix
index 762e39fe4b14..f231f98df85d 100644
--- a/pkgs/development/python-modules/pyiqvia/default.nix
+++ b/pkgs/development/python-modules/pyiqvia/default.nix
@@ -3,7 +3,7 @@
 , aiohttp
 , aresponses
 , fetchFromGitHub
-, poetry
+, poetry-core
 , pytest-aiohttp
 , pytest-asyncio
 , pytestCheckHook
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pyiqvia";
-  version = "0.3.1";
+  version = "0.3.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -21,10 +21,10 @@ buildPythonPackage rec {
     owner = "bachya";
     repo = pname;
     rev = version;
-    sha256 = "1yjsbq4p040a35n8g2l0wgnv83wkjirv4rj73s2mjzn3cxf395bz";
+    sha256 = "089lah23939m523jmjkaw2li0fikp2nswxznfvzwnr6wjpp3m9as";
   };
 
-  nativeBuildInputs = [ poetry ];
+  nativeBuildInputs = [ poetry-core ];
 
   propagatedBuildInputs = [ aiohttp ];