From 6c86b393aec3dcd30d594dc8e9f07241b30e07f5 Mon Sep 17 00:00:00 2001 From: Matej Urbas Date: Sat, 21 Nov 2020 20:58:49 +0000 Subject: [PATCH 1/3] python3Packages.py-air-control: init at 2.1.0 --- .../python-modules/py-air-control/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/py-air-control/default.nix diff --git a/pkgs/development/python-modules/py-air-control/default.nix b/pkgs/development/python-modules/py-air-control/default.nix new file mode 100644 index 00000000000..77b61123d9e --- /dev/null +++ b/pkgs/development/python-modules/py-air-control/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage, coapthon3, fetchFromGitHub, isPy27, lib, pycryptodomex }: + +buildPythonPackage rec { + pname = "py-air-control"; + version = "2.1.0"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "rgerganov"; + repo = pname; + rev = "v${version}"; + sha256 = "0mkggl5hwmj90djxbbz4svim6iv7xl8k324cb4rlc75p5rgcdwmh"; + }; + + propagatedBuildInputs = [ pycryptodomex coapthon3 ]; + + # tests sometimes hang forever on tear-down + doCheck = false; + pythonImportsCheck = [ "pyairctrl" ]; + + meta = with lib; { + inherit (src.meta) homepage; + description = "Command Line App for Controlling Philips Air Purifiers."; + license = licenses.mit; + maintainers = with maintainers; [ urbas ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7ee90734ecb..5f65fc9d18b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4837,6 +4837,8 @@ in { pxml = callPackage ../development/python-modules/pxml { }; + py-air-control = callPackage ../development/python-modules/py-air-control { }; + py2bit = callPackage ../development/python-modules/py2bit { }; py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); From 2535a09289f1176ba69a821f67bbf97cfbf15c9e Mon Sep 17 00:00:00 2001 From: Matej Urbas Date: Thu, 26 Nov 2020 22:16:12 +0000 Subject: [PATCH 2/3] python3Packages.coapthon3: disabled tests --- .../python-modules/coapthon3/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/coapthon3/default.nix b/pkgs/development/python-modules/coapthon3/default.nix index fbca43e4e71..1e519f074c2 100644 --- a/pkgs/development/python-modules/coapthon3/default.nix +++ b/pkgs/development/python-modules/coapthon3/default.nix @@ -1,19 +1,25 @@ -{ buildPythonPackage, cachetools, fetchPypi, lib }: +{ buildPythonPackage, cachetools, fetchFromGitHub, lib }: buildPythonPackage rec { pname = "CoAPthon3"; version = "1.0.1"; - src = fetchPypi { - inherit pname version; - sha256 = "1w6bwwd3qjp4b4fscagqg9wqxpdgvf4sxgzbk2d2rjqwlkyr1lnx"; + src = fetchFromGitHub { + owner = "Tanganelli"; + repo = pname; + rev = version; + sha256 = "1im35i5i72y1p9qj8ixkwq7q6ksbrmi42giqiyfgjp1ym38snl69"; }; propagatedBuildInputs = [ cachetools ]; + # tests take in the order of 10 minutes to execute and sometimes hang forever on tear-down + doCheck = false; + pythonImportsCheck = [ "coapthon" ]; + meta = with lib; { + inherit (src.meta) homepage; description = "Python3 library to the CoAP protocol compliant with the RFC."; - homepage = "https://github.com/Tanganelli/${pname}"; license = licenses.mit; maintainers = with maintainers; [ urbas ]; }; From b4c38bc841976f47d744b965d2acbc240abc353f Mon Sep 17 00:00:00 2001 From: Matej Urbas Date: Thu, 26 Nov 2020 22:28:24 +0000 Subject: [PATCH 3/3] python3Packages.coapthon3: disabled for Python 2.7 --- pkgs/development/python-modules/coapthon3/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/coapthon3/default.nix b/pkgs/development/python-modules/coapthon3/default.nix index 1e519f074c2..6f22e8e9f29 100644 --- a/pkgs/development/python-modules/coapthon3/default.nix +++ b/pkgs/development/python-modules/coapthon3/default.nix @@ -1,8 +1,9 @@ -{ buildPythonPackage, cachetools, fetchFromGitHub, lib }: +{ buildPythonPackage, cachetools, fetchFromGitHub, isPy27, lib }: buildPythonPackage rec { pname = "CoAPthon3"; version = "1.0.1"; + disabled = isPy27; src = fetchFromGitHub { owner = "Tanganelli";