From 12672f38a1547c4e6af1f32a3c0c3196b87d0804 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 5 Jan 2025 21:30:22 +0300 Subject: [PATCH 1/3] python312Packages.commonregex: init at 1.5.4 --- .../python-modules/commonregex/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/commonregex/default.nix diff --git a/pkgs/development/python-modules/commonregex/default.nix b/pkgs/development/python-modules/commonregex/default.nix new file mode 100644 index 000000000000..7075fc7322e8 --- /dev/null +++ b/pkgs/development/python-modules/commonregex/default.nix @@ -0,0 +1,26 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, +}: + +buildPythonPackage rec { + pname = "commonregex"; + version = "1.5.4"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-JxUwZ4rYr1PA6MIzp2JZeWnoRtACnxIhWsF4eR894KU="; + }; + + build-system = [ setuptools ]; + + meta = with lib; { + description = "A collection of common regular expressions bundled with an easy to use interface"; + homepage = "https://github.com/madisonmay/CommonRegex"; + maintainers = with maintainers; [ k900 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index abac140b6209..26d7552ac57c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2568,6 +2568,8 @@ self: super: with self; { commonmark = callPackage ../development/python-modules/commonmark { }; + commonregex = callPackage ../development/python-modules/commonregex { }; + complycube = callPackage ../development/python-modules/complycube { }; compreffor = callPackage ../development/python-modules/compreffor { }; From 76b688c193330b734c61824cecc591229a1798a8 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 5 Jan 2025 21:30:37 +0300 Subject: [PATCH 2/3] python312Packages.midea-local: init at 6.0.3 --- .../python-modules/midea-local/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/midea-local/default.nix diff --git a/pkgs/development/python-modules/midea-local/default.nix b/pkgs/development/python-modules/midea-local/default.nix new file mode 100644 index 000000000000..faa7c1f5a745 --- /dev/null +++ b/pkgs/development/python-modules/midea-local/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + aiofiles, + aiohttp, + colorlog, + commonregex, + defusedxml, + deprecated, + ifaddr, + pycryptodome, + platformdirs, +}: + +buildPythonPackage rec { + pname = "midea-local"; + version = "6.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "midea-lan"; + repo = pname; + tag = "v${version}"; + hash = "sha256-Q0ua0cIYfZ60RzrRNatx+a1nz1f51rR2D5IS5abXKME="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiofiles + aiohttp + colorlog + commonregex + defusedxml + deprecated + ifaddr + pycryptodome + platformdirs + ]; + + meta = with lib; { + description = " Control your Midea M-Smart appliances via local area network"; + homepage = "https://github.com/midea-lan/midea-local"; + changelog = "https://github.com/midea-lan/midea-local/releases/tag/v${version}"; + maintainers = with maintainers; [ k900 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 26d7552ac57c..3133a41b5a1f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8163,6 +8163,8 @@ self: super: with self; { midea-beautiful-air = callPackage ../development/python-modules/midea-beautiful-air { }; + midea-local = callPackage ../development/python-modules/midea-local { }; + midiutil = callPackage ../development/python-modules/midiutil { }; mido = callPackage ../development/python-modules/mido { }; From 4cca87cd7b809ac7ba07f0a9c8fd359019e63bee Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 5 Jan 2025 21:30:46 +0300 Subject: [PATCH 3/3] home-assistant-custom-components.midea_ac_lan: switch to maintained fork --- .../custom-components/midea_ac_lan/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix b/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix index 58b264b5e02b..7e2fbc3da940 100644 --- a/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix +++ b/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix @@ -2,27 +2,27 @@ lib, buildHomeAssistantComponent, fetchFromGitHub, - pycryptodome, + midea-local, }: buildHomeAssistantComponent rec { - owner = "georgezhao2010"; + owner = "wuwentao"; domain = "midea_ac_lan"; - version = "0.3.22"; + version = "0.6.5"; src = fetchFromGitHub { inherit owner; repo = domain; - rev = "v${version}"; - hash = "sha256-xTnbA4GztHOE61QObEJbzUSdbuSrhbcJ280DUDdM+n4="; + tag = "v${version}"; + hash = "sha256-BOKGALMrJg2zhcF6E874xaBpqNDivToCQhBP8kh4oJY="; }; - dependencies = [ pycryptodome ]; + dependencies = [ midea-local ]; meta = with lib; { description = "Auto-configure and then control your Midea M-Smart devices (Air conditioner, Fan, Water heater, Washer, etc) via local area network"; - homepage = "https://github.com/georgezhao2010/midea_ac_lan/"; - changelog = "https://github.com/georgezhao2010/midea_ac_lan/releases/tag/v${version}"; + homepage = "https://github.com/wuwentao/midea_ac_lan/"; + changelog = "https://github.com/wuwentao/midea_ac_lan/releases/tag/v${version}"; maintainers = with maintainers; [ k900 ]; license = licenses.mit; };