From ddbe10693427d2c1b9ecd7c00ab582c172ed10ff Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 17 Jun 2021 05:22:28 +0200 Subject: [PATCH 1/6] python3Packages.typing_inspect: 0.6.0 -> 0.7.1 --- pkgs/development/python-modules/typing-inspect/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/typing-inspect/default.nix b/pkgs/development/python-modules/typing-inspect/default.nix index 569096cb466c..4f09d6002d5c 100644 --- a/pkgs/development/python-modules/typing-inspect/default.nix +++ b/pkgs/development/python-modules/typing-inspect/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "typing-inspect"; - version = "0.6.0"; + version = "0.7.1"; src = fetchPypi { inherit version; pname = "typing_inspect"; - sha256 = "1dzs9a1pr23dhbvmnvms2jv7l7jk26023g5ysf0zvnq8b791s6wg"; + sha256 = "1al2lyi3r189r5xgw90shbxvd88ic4si9w7n3d9lczxiv6bl0z84"; }; propagatedBuildInputs = [ @@ -26,6 +26,5 @@ buildPythonPackage rec { homepage = "https://github.com/ilevkivskyi/typing_inspect"; license = licenses.mit; maintainers = with maintainers; [ albakham ]; - broken = isPy39; # see https://github.com/ilevkivskyi/typing_inspect/issues/65 }; } From 63625b213a6ce8f66fcdb2b557c884b2cc301a1b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 17 Jun 2021 06:09:39 +0200 Subject: [PATCH 2/6] python3Packages.aioguardian: remove version boundary --- pkgs/development/python-modules/aioguardian/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index 388c856fc619..74ff8fb3fde6 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -16,7 +16,6 @@ buildPythonPackage rec { pname = "aioguardian"; version = "1.0.7"; - disabled = pythonAtLeast "3.9"; src = fetchFromGitHub { owner = "bachya"; From d7ba66af1541c2ce375d450e02eae090be3f95ad Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 17 Jun 2021 06:10:33 +0200 Subject: [PATCH 3/6] python3Packages.aiohomekit: remove version boundary --- pkgs/development/python-modules/aiohomekit/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 6d77598c863e..a94cdf865b03 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -13,7 +13,6 @@ buildPythonPackage rec { pname = "aiohomekit"; version = "0.2.67"; format = "pyproject"; - disabled = pythonAtLeast "3.9"; src = fetchFromGitHub { owner = "Jc2k"; From 54bf6c078305798a1ea631d3b53d7a38caa4a402 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 17 Jun 2021 06:11:00 +0200 Subject: [PATCH 4/6] python3Packags.pytile: remove version boundary --- pkgs/development/python-modules/pytile/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix index c1901a750864..0d269522e1a0 100644 --- a/pkgs/development/python-modules/pytile/default.nix +++ b/pkgs/development/python-modules/pytile/default.nix @@ -14,7 +14,6 @@ buildPythonPackage rec { pname = "pytile"; version = "5.2.1"; - disabled = pythonAtLeast "3.9"; src = fetchFromGitHub { owner = "bachya"; From b362f002cac9e7ca78e1cc054f09b3de782160f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 17 Jun 2021 06:19:49 +0200 Subject: [PATCH 5/6] home-assistant: disable test_hue_events test It is prone to race conditions. --- pkgs/servers/home-assistant/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 58d7898132b3..e2c943c2f4c7 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -782,6 +782,8 @@ in with py.pkgs; buildPythonApplication rec { # onboarding tests rpi_power component, for which we are lacking rpi_bad_power library "test_onboarding_core_sets_up_rpi_power" "test_onboarding_core_no_rpi_power" + # hue/test_sensor_base.py: Race condition when counting events + "test_hue_events" ]; preCheck = '' From a45931787c3a5967d8df7847c25c545975b5f1df Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 17 Jun 2021 06:27:07 +0200 Subject: [PATCH 6/6] home-assistant: unpin sqlalchemy --- pkgs/servers/home-assistant/default.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e2c943c2f4c7..b88e73c51d3b 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -134,19 +134,6 @@ let }); }) - # Remove after https://github.com/NixOS/nixpkgs/pull/121854 has passed staging-next - (self: super: { - sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "1.4.13"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0npsg38d11skv04zvsi90j93f6jdgm8666ds2ri7shr1pz1732hx"; - }; - patches = []; - propagatedBuildInputs = [ python3.pkgs.greenlet ]; - }); - }) - # home-assistant-frontend does not exist in python3.pkgs (self: super: { home-assistant-frontend = self.callPackage ./frontend.nix { };