From c1cf9a0fe63637dbe9b4c65896feb140079c05aa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 13 Feb 2023 15:53:34 +0000 Subject: [PATCH 1/6] python310Packages.aioesphomeapi: 13.2.0 -> 13.3.1 Diff: https://github.com/esphome/aioesphomeapi/compare/refs/tags/v13.2.0...v13.3.1 Changelog: https://github.com/esphome/aioesphomeapi/releases/tag/v13.3.1 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 12bdd985abbe..c0d21eec563a 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "13.2.0"; + version = "13.3.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ACO5vp5ZMxzfY4RBvZ+vbk+fsj43Q896bar0+HNYHwE="; + hash = "sha256-Pca+SMuUL3XyQpLAL6SOYPnztc95WF2o0v4+5Nc5Nxg="; }; postPatch = '' From a3526481a6617daa2fb38a7285a2356ea66d3260 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 13 Feb 2023 15:53:59 +0000 Subject: [PATCH 2/6] python310Packages.oralb-ble: 0.17.4 -> 0.17.5 Diff: https://github.com/Bluetooth-Devices/oralb-ble/compare/refs/tags/v0.17.4...v0.17.5 Changelog: https://github.com/Bluetooth-Devices/oralb-ble/releases/tag/v0.17.5 --- pkgs/development/python-modules/oralb-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix index c0f2840763ea..689cd7903368 100644 --- a/pkgs/development/python-modules/oralb-ble/default.nix +++ b/pkgs/development/python-modules/oralb-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "oralb-ble"; - version = "0.17.4"; + version = "0.17.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KvvcyeYXBtV/sUKMv+1xoXH9ALUX46EWS/STFZkCnUQ="; + hash = "sha256-Lwrr5XzU2pbx3cYkvYtHgXFhGnz3cMBnNFWCpuY3ltg="; }; nativeBuildInputs = [ From 18a3b21de225ac26ec1beed1fbd8fcefcc956923 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 13 Feb 2023 15:54:18 +0000 Subject: [PATCH 3/6] python310Packages.xiaomi-ble: 0.16.1 -> 0.16.3 Diff: https://github.com/Bluetooth-Devices/xiaomi-ble/compare/refs/tags/v0.16.1...v0.16.3 Changelog: https://github.com/Bluetooth-Devices/xiaomi-ble/releases/tag/v0.16.3 --- pkgs/development/python-modules/xiaomi-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index 7815a36396be..8dfbd418157a 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.16.1"; + version = "0.16.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JsrOt6LmmhJZ4MBwLVKKt3IMbvAnxJx70AZROhb9gbc="; + hash = "sha256-yk3rEOcHIEZLz3qKxeGzHuVUWWxG3GhSt9vc0pXcanQ="; }; nativeBuildInputs = [ From 22b11b3bb82810fd58f6347cd18757f95c0f332c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 13 Feb 2023 15:56:01 +0000 Subject: [PATCH 4/6] python310Packages.yalexs-ble: 1.12.8 -> 1.12.12 Diff: https://github.com/bdraco/yalexs-ble/compare/refs/tags/v1.12.8...1.12.12 Changelog: https://github.com/bdraco/yalexs-ble/blob/v1.12.12/CHANGELOG.md --- pkgs/development/python-modules/yalexs-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 3e2de3d2afcd..46f1904faf23 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "1.12.8"; + version = "1.12.12"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-04Xl2TBs9RL+KWmJgUY+PDoYN4AAvrcWP7TJBEu5lNU="; + hash = "sha256-CO+plbsZzQkxtvz8N3QP71P2V1wPdyp1oeW/424mZks="; }; nativeBuildInputs = [ From b421e2a0a3998939d9cdba2f791a253a2f10a570 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 13 Feb 2023 16:04:48 +0000 Subject: [PATCH 5/6] home-assistant: 2023.2.3 -> 2023.2.4 https://github.com/home-assistant/core/releases/tag/2023.2.4 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 8abe197bee7d..3a171c41725a 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.2.3"; + version = "2023.2.4"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 921a6dccbc1b..9811d52a8db9 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -270,7 +270,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.2.3"; + hassVersion = "2023.2.4"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -288,7 +288,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-cRdxlmlgkKTnrtqGQPbSpBLHf+vfI9T6sdETcGshN9M="; + hash = "sha256-Lt/t4S6To0MvdvmdKir7VytrNXPGhC7sMfjQmgox5XY="; }; nativeBuildInputs = with python3.pkgs; [ From 1069dbc604de80eccfdd2f19b3ecc7e6311b45bc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 13 Feb 2023 17:13:20 +0100 Subject: [PATCH 6/6] python310Packages.raincloudy: Fix build Due to an improper update during a python-updates cycle this package broke. With version 1.2.0 there is now `raincloudy.aio`, which does not get installed on recent setuptools versions, due to a misconfigured packages configuration in setup.py. Also convert the build process to a PEP517 based build using setuptools and fix the distinfo version by adding setuptools-scm. Additionally `aiohttp` is an undeclared dependencym, for which a PR has already been submitted upstream. --- .../python-modules/raincloudy/default.nix | 35 +++++++++++++++---- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/raincloudy/default.nix b/pkgs/development/python-modules/raincloudy/default.nix index da4a3846a95f..6a223bb4fb76 100644 --- a/pkgs/development/python-modules/raincloudy/default.nix +++ b/pkgs/development/python-modules/raincloudy/default.nix @@ -1,12 +1,18 @@ { lib +, aiohttp +, aioresponses , beautifulsoup4 , buildPythonPackage , fetchFromGitHub , html5lib +, pytest-asyncio +, pytest-aiohttp , pytestCheckHook , pythonOlder , requests , requests-mock +, setuptools +, setuptools-scm , urllib3 }: @@ -24,7 +30,25 @@ buildPythonPackage rec { hash = "sha256-qCkBVirM09iA1sXiOB9FJns8bHjQq7rRk8XbRWrtBDI="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + postPatch = '' + # https://github.com/vanstinator/raincloudy/pull/60 + substituteInPlace setup.py \ + --replace "bs4" "beautifulsoup4" \ + + # fix raincloudy.aio package discovery, by relying on + # autodiscovery instead. + sed -i '/packages=/d' setup.py + ''; + propagatedBuildInputs = [ + aiohttp requests beautifulsoup4 urllib3 @@ -32,19 +56,16 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytest-aiohttp pytestCheckHook requests-mock ]; - postPatch = '' - # https://github.com/vanstinator/raincloudy/pull/60 - substituteInPlace setup.py \ - --replace "bs4" "beautifulsoup4" \ - --replace "html5lib==1.0.1" "html5lib" - ''; - pythonImportsCheck = [ "raincloudy" + "raincloudy.aio" ]; disabledTests = [