From 6d145feaea9baad5ce6bcc4b2f5914bca5e1354e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Apr 2021 09:35:39 +0200 Subject: [PATCH 1/2] python3Packages.yeelight: 0.5.4 -> 0.6.0 --- .../python-modules/yeelight/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix index 443b4daec854..85b282566eef 100644 --- a/pkgs/development/python-modules/yeelight/default.nix +++ b/pkgs/development/python-modules/yeelight/default.nix @@ -1,39 +1,39 @@ { lib -, fetchgit , buildPythonPackage -, pythonOlder -, enum-compat +, fetchFromGitLab , future , ifaddr -, mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "yeelight"; - version = "0.5.4"; + version = "0.6.0"; + disabled = pythonOlder "3.4"; - src = fetchgit { - url = "https://gitlab.com/stavros/python-yeelight.git"; - rev = "119faeff0d4f9de8c7f6d0580bdecc1c79bcdaea"; # v0.5.4 wasn't tagged - sha256 = "0j2c5pzd3kny7ghr9q7xn9vs8dffvyzz5igaavvvd04w7aph29sy"; + src = fetchFromGitLab { + owner = "stavros"; + repo = "python-yeelight"; + rev = "v${version}"; + sha256 = "0yycc2pdqaa9y46jycvm0p6braps7ljg2vvljngdqj2l1a2jmv7x"; }; propagatedBuildInputs = [ future ifaddr - ] ++ lib.optional (pythonOlder "3.4") enum-compat; + ]; checkInputs = [ pytestCheckHook - ] ++ lib.optional (pythonOlder "3.3") mock; + ]; pytestFlagsArray = [ "yeelight/tests.py" ]; pythonImportsCheck = [ "yeelight" ]; meta = with lib; { - description = "A Python library for controlling YeeLight RGB bulbs"; + description = "Python library for controlling YeeLight RGB bulbs"; homepage = "https://gitlab.com/stavros/python-yeelight/"; license = licenses.asl20; maintainers = with maintainers; [ nyanloutre ]; From 0b4da909a5ea75f5d21289acf1741ac8aefad61d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Apr 2021 13:17:51 +0200 Subject: [PATCH 2/2] home-assistant: enable yeelight tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 5e7e97924adc..60a38b7a5b29 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -371,6 +371,7 @@ in with py.pkgs; buildPythonApplication rec { "wled" "workday" "worldclock" + "yeelight" "zeroconf" "zha" "zone"