diff --git a/pkgs/development/python-modules/asyncinotify/default.nix b/pkgs/development/python-modules/asyncinotify/default.nix index c5f944d6a53a..9257e12f721e 100644 --- a/pkgs/development/python-modules/asyncinotify/default.nix +++ b/pkgs/development/python-modules/asyncinotify/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "asyncinotify"; - version = "4.0.1"; + version = "4.0.2"; format = "flit"; src = fetchFromGitLab { owner = "Taywee"; repo = "asyncinotify"; rev = "v${version}"; - hash = "sha256-DMRuj16KjO+0uAB33UCVPdUiQGzri1b/z9KVqQYp2Po="; + hash = "sha256-Q7b406UENCmD9SGbaml+y2YLDi7VLZBmDkYMo8CLuVw="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index ec35a06c2029..332d4866e09a 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.35"; + version = "0.5.36"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - hash = "sha256-gHHLKviU1ZHrlBp4R3WqAwEGWiM7VuB7lOYiUIJ1J7A="; + hash = "sha256-5eA9fqL748VigNgy1G7bZtMstV7EI9LLPhv6xZnCEFA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyfibaro/default.nix b/pkgs/development/python-modules/pyfibaro/default.nix index 2a99f637f850..0b5d016a422c 100644 --- a/pkgs/development/python-modules/pyfibaro/default.nix +++ b/pkgs/development/python-modules/pyfibaro/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyfibaro"; - version = "0.7.1"; + version = "0.7.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "rappenze"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fgFbwMqlQcF83k345kztw/SN5j447/TuJUPYmFPKiFY="; + hash = "sha256-dAC+jW+Ky+uPsgBXpp81+bxytWYeZbd+zWzEXkmM198="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 6a34b756b1c8..473299334801 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.30.0"; + version = "0.30.2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-ut7iaVR/2vGJ4L6/3dl9EmMVly3gvkhHqnBFAeTOQ1Y="; + hash = "sha256-mjhHNnhYNMrn4aiPvcq6YM9XCyfzOeZ/yh3RIYiZeaY="; }; pythonRelaxDeps = [ diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 31dfa15c5dd2..578339e4d6e4 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.7.2"; + version = "2023.7.3"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -710,7 +710,6 @@ aiodiscover aiohttp-cors async-upnp-client - av bleak bleak-retry-connector bluetooth-adapters @@ -718,6 +717,7 @@ bluetooth-data-tools dbus-fast fnv-hash-fast + ha-av hass-nabucasa hassil home-assistant-frontend @@ -1364,7 +1364,7 @@ ]; "generic" = ps: with ps; [ aiohttp-cors - av + ha-av pillow ]; "generic_hygrostat" = ps: with ps; [ @@ -3882,7 +3882,7 @@ ]; # missing inputs: stookwijzer "stream" = ps: with ps; [ aiohttp-cors - av + ha-av numpy pyturbojpeg ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 74aad1b6a26a..d79b8cf5c913 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -76,6 +76,16 @@ let doCheck = false; }); + ha-av = super.av.overridePythonAttrs (oldAttrs: rec { + pname = "ha-av"; + version = "10.1.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-HjOu/A1U3CfoVq6VqxA621/9wXk8hFnTFWtdpnVoFr4="; + }; + }); + jaraco-abode = super.jaraco-abode.overridePythonAttrs (oldAttrs: rec { version = "3.3.0"; src = fetchFromGitHub { @@ -287,7 +297,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.7.2"; + hassVersion = "2023.7.3"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -303,7 +313,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-fESzpOOEGFOJJ0ldI/VaVN0kH/zbCCq25s8vNnCUOFs="; + hash = "sha256-wYS7G3AD1G7UzXfrJxrHGpQTBLJFa7Qln1VU0pdcNro="; }; # Secondary source is git for tests @@ -311,7 +321,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-HW+XO84enAA3BH4nppkXvAERT74y5m5jvz0uHWkkS6k="; + hash = "sha256-2m0RpEQ4Rds9+JVQj5/HTmOZzYd4yWL+MfjQs923VL0="; }; nativeBuildInputs = with python.pkgs; [ @@ -347,6 +357,7 @@ in python.pkgs.buildPythonApplication rec { "pip" "PyJWT" "pyOpenSSL" + "PyYAML" "requests" "typing_extensions" "voluptuous-serialize" diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index aca9237df24d..1df4d98fb45d 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -40,7 +40,6 @@ PKG_SET = "home-assistant.python.pkgs" # following can be used to choose the correct one PKG_PREFERENCES = { "fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466 - "ha-av": "av", "HAP-python": "hap-python", "tensorflow": "tensorflow", "yt-dlp": "yt-dlp", diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 8c492c347094..e1c41449b851 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.7.1"; + version = "2023.7.2"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-RRfORjC1YC9z9oYY1GGCnWUlK1N0EaG89hlrMn8Qmh8="; + hash = "sha256-0Kx1qfeWvDH3JDbziwmAwJcpb7Loix1oGAZGPKvfHac="; }; nativeBuildInputs = [