Merge pull request #78734 from Mic92/appdaemon

appdaemon: 3.0.5 -> 4.0.1

3 files changed, 59 insertions, 14 deletions

diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix
new file mode 100644
index 000000000000..64d82e17466e
--- /dev/null
+++ b/pkgs/development/python-modules/deepdiff/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, mock
+, jsonpickle
+, ordered-set
+, numpy
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "deepdiff";
+  version = "4.0.9";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "5e2343398e90538edaa59c0c99207e996a3a834fdc878c666376f632a760c35a";
+  };
+
+  # # Extra packages (may not be necessary)
+  checkInputs = [
+    mock
+    numpy
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # skipped tests require murmur module
+    "test_prep_str_murmur3_64bit"
+    "test_prep_str_murmur3_128bit"
+  ];
+
+  propagatedBuildInputs = [
+    jsonpickle
+    ordered-set
+  ];
+
+  meta = with lib; {
+    description = "Deep Difference and Search of any Python object/data";
+    homepage = "https://github.com/seperman/deepdiff";
+    license = licenses.mit;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix
index 47d9e88999af..258e46db1990 100644
--- a/pkgs/servers/home-assistant/appdaemon.nix
+++ b/pkgs/servers/home-assistant/appdaemon.nix
@@ -1,18 +1,14 @@
-{ lib, python3 }:
+{ lib, python3, fetchFromGitHub }:
 
 let
   python = python3.override {
     packageOverrides = self: super: {
-
-      aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec {
-        version = "2.3.10";
+      bcrypt = super.bcrypt.overridePythonAttrs (oldAttrs: rec {
+        version = "3.1.4";
         src = oldAttrs.src.override {
           inherit version;
-          sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
+          sha256 = "13cyrnqwkhc70rs6dg65z4yrrr3dc42fhk11804fqmci9hvimvb7";
         };
-        # TODO: remove after pinning aiohttp to a newer version
-        propagatedBuildInputs = with self; [ chardet multidict async-timeout yarl idna-ssl ];
-        doCheck = false;
       });
 
       yarl = super.yarl.overridePythonAttrs (oldAttrs: rec {
@@ -43,23 +39,26 @@ let
 
 in python.pkgs.buildPythonApplication rec {
   pname = "appdaemon";
-  version = "3.0.5";
+  version = "4.0.1";
 
-  src = python.pkgs.fetchPypi {
-    inherit pname version;
-    sha256 = "623897ce08dc2efe24d04380df36e4b7fb35c0e4007e882857d4047f0b60349d";
+  src = fetchFromGitHub {
+    owner = "home-assistant";
+    repo = "appdaemon";
+    rev = version;
+    sha256 = "13qzjv11b0c7s1c66j70qmc222a78805n10lv2svj9yyk1v4xhjv";
   };
 
   propagatedBuildInputs = with python.pkgs; [
-    daemonize astral requests sseclient websocket_client aiohttp yarl jinja2
+    daemonize astral requests websocket_client aiohttp yarl jinja2
     aiohttp-jinja2 pyyaml voluptuous feedparser iso8601 bcrypt paho-mqtt setuptools
+    deepdiff dateutil bcrypt python-socketio pid
   ];
 
   # no tests implemented
   doCheck = false;
 
   postPatch = ''
-    substituteInPlace setup.py --replace "pyyaml==5.1" "pyyaml"
+    substituteInPlace requirements.txt --replace "pyyaml==5.1" "pyyaml"
   '';
 
   meta = with lib; {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 148990650dd2..f400f59eadd7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -500,6 +500,8 @@ in {
 
   braintree = callPackage ../development/python-modules/braintree { };
 
+  deepdiff = callPackage ../development/python-modules/deepdiff { };
+
   django-sesame = callPackage ../development/python-modules/django-sesame { };
 
   breathe = callPackage ../development/python-modules/breathe { };