From cc53194fbd775345ae3afee98a827630c2310dc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Mar 2023 20:08:36 +0000 Subject: [PATCH 1/4] python310Packages.pyinsteon: 1.3.3 -> 1.3.4 --- pkgs/development/python-modules/pyinsteon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 400791197b6f..e7e9747d7f85 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.3.3"; + version = "1.3.4"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-zbqgwCukTmvCIXpAvaKQl7voOI4ATqsT9NPUyRhw2EE="; + hash = "sha256-P/5kCXmUWQ/2yvzu/Pr0XBY8zm3fMMyoapGmdtRmxXo="; }; nativeBuildInputs = [ From 4e04af68ea0029237ba55437a869f4de5a03cdf0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 8 Mar 2023 18:57:31 +0100 Subject: [PATCH 2/4] home-assistant: 2023.3.1 -> 2023.3.2 https://github.com/home-assistant/core/releases/tag/2023.3.2 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 10 +++++----- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 00b8f30fe503..c348ca08bf9d 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.3.1"; + version = "2023.3.2"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 89d6ead49068..1f124d153be4 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -181,11 +181,11 @@ let }); sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "2.0.4"; + version = "2.0.5.post1"; src = super.fetchPypi { pname = "SQLAlchemy"; inherit version; - hash = "sha256-laGOGmryEU29nuTxaK0zBw1jF+Ebr6KNmDzHtYX+kAs="; + hash = "sha256-E+sqWILP2fTu2q7BSlYDoJbwEl98PLSGEbO/o8JT8l0="; }; nativeCheckInputs = oldAttrs.nativeCheckInputs ++ (with super; [ pytest-xdist @@ -263,7 +263,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.3.1"; + hassVersion = "2023.3.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -279,7 +279,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-FvdMNtiLJ6p9I6aEeICukx9mykGGMoONGNdM/I4u/eY="; + hash = "sha256-I6NSVoMS3xbUqh/7BxJj/Evkk7+g3N0dZVJjEbr2pCs="; }; # Secondary source is git for tests @@ -287,7 +287,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-2usXU1a/QKEIaeg8JFBf/4ID2nzZLoGsfK7KXreKEBE="; + hash = "sha256-Qd++/73c9VDNe4AMdiDIVJXxh4qFx2x4HDkY1An2VjE="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 6c7329d20707..26ef8b7168f2 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20230302.0"; + version = "20230306.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-G+XexUc5yvADjbXBgg97FB03Al3zR9WTb4cuVBBrSuI="; + hash = "sha256-E/e1XyhwFiNMLz7+o99eG9sW2ZCCfPFnkBcu3BpCbxQ="; }; # there is nothing to strip in this package From 9ce2e1a4153746a5b92d5e10858d306e896594af Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 8 Mar 2023 23:47:33 +0100 Subject: [PATCH 3/4] python310Packages.homeassistant-stubs: Relax home-assistant version Pin the home-assistant version constraint to the year and month of a release, to allow easier upgrades within a month, where the number of typing changes is probably lower. --- pkgs/servers/home-assistant/stubs.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 4e31078381ff..52b758a8f6a6 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -25,6 +25,14 @@ buildPythonPackage rec { home-assistant ]; + postPatch = '' + # Relax constraint to year and month + substituteInPlace pyproject.toml --replace \ + 'homeassistant = "${version}"' \ + 'homeassistant = "~${lib.versions.majorMinor home-assistant.version}"' + cat pyproject.toml + ''; + pythonImportsCheck = [ "homeassistant-stubs" ]; From a58940b35c31325588802fa70901dc9b290e864b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 9 Mar 2023 08:27:28 +0100 Subject: [PATCH 4/4] python310Packages.homeassistant-stubs: 2023.3.1 -> 2023.3.2 Diff: https://github.com/KapJI/homeassistant-stubs/compare/refs/tags/2023.3.1...2023.3.2 Changelog: https://github.com/KapJI/homeassistant-stubs/releases/tag/2023.3.2 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 52b758a8f6a6..0576814b68ee 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.3.1"; + version = "2023.3.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-WMuQgoWwri4nfKkZ8cW5o6S6G3PbHqlUxC9wyJSZhxQ="; + hash = "sha256-tgXjACNGD3QTrsgYtcTinW4HflwGSoCR6k6SrawQz6A="; }; nativeBuildInputs = [