From a31b972e9bc0b3b023fd3f9bb56b94a0a93e00ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 10:18:45 +0100 Subject: [PATCH 01/21] python3Packages.surepy: init at 0.5.0 --- .../python-modules/surepy/default.nix | 61 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/python-modules/surepy/default.nix diff --git a/pkgs/development/python-modules/surepy/default.nix b/pkgs/development/python-modules/surepy/default.nix new file mode 100644 index 00000000000..dd071b5cf08 --- /dev/null +++ b/pkgs/development/python-modules/surepy/default.nix @@ -0,0 +1,61 @@ +{ lib +, aiodns +, aiohttp +, async-timeout +, brotlipy +, buildPythonPackage +, cchardet +, click +, colorama +, fetchFromGitHub +, halo +, poetry-core +, pythonOlder +, requests +, rich +}: + +buildPythonPackage rec { + pname = "surepy"; + version = "0.5.0"; + format = "pyproject"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "benleb"; + repo = pname; + rev = "v${version}"; + sha256 = "1adsnjya142bxdhfxqsi2qa35ylvdcibigs1wafjlxazlxs3mg0j"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ + aiodns + aiohttp + async-timeout + brotlipy + cchardet + click + colorama + halo + requests + rich + ]; + + postPatch = '' + # halo is out-dated, https://github.com/benleb/surepy/pull/7 + substituteInPlace pyproject.toml --replace "^0.0.30" "^0.0.31" + ''; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "surepy" ]; + + meta = with lib; { + description = "Python library to interact with the Sure Petcare API"; + homepage = "https://github.com/benleb/surepy"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 17f6624c42e..6e150f728c5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7573,6 +7573,8 @@ in { sure = callPackage ../development/python-modules/sure { }; + surepy = callPackage ../development/python-modules/surepy { }; + survey = callPackage ../development/python-modules/survey { }; suseapi = callPackage ../development/python-modules/suseapi { }; From b3f5d13ac60b7da85bbf23e7fb467a9494def777 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 10:23:06 +0100 Subject: [PATCH 02/21] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 40779f4bc19..859fc4170a8 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -796,7 +796,7 @@ "sun" = ps: with ps; [ ]; "supervisord" = ps: with ps; [ ]; "supla" = ps: with ps; [ ]; # missing inputs: asyncpysupla - "surepetcare" = ps: with ps; [ ]; # missing inputs: surepy + "surepetcare" = ps: with ps; [ surepy ]; "swiss_hydrological_data" = ps: with ps; [ swisshydrodata ]; "swiss_public_transport" = ps: with ps; [ python-opendata-transport ]; "swisscom" = ps: with ps; [ ]; From 0418f881fefaea565b3492c0216b7e7c8c44c964 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 11:03:48 +0100 Subject: [PATCH 03/21] python3Packages.aioambient: init 1.2.3 --- .../python-modules/aioambient/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/aioambient/default.nix diff --git a/pkgs/development/python-modules/aioambient/default.nix b/pkgs/development/python-modules/aioambient/default.nix new file mode 100644 index 00000000000..cd47d7f0879 --- /dev/null +++ b/pkgs/development/python-modules/aioambient/default.nix @@ -0,0 +1,57 @@ +{ lib +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytest-cov +, pytestCheckHook +, python-engineio +, python-socketio +, pythonOlder +, websockets +}: + +buildPythonPackage rec { + pname = "aioambient"; + version = "1.2.3"; + format = "pyproject"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "1jg93rjn1gxc66qmipw4z1c09l8hgfsydacjgkfjq7vg547lragp"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ + aiohttp + python-engineio + python-socketio + websockets + ]; + + checkInputs = [ + aresponses + asynctest + pytest-asyncio + pytest-cov + pytestCheckHook + ]; + + # Ignore the examples directory as the files are prefixed with test_ + pytestFlagsArray = [ "--ignore examples/" ]; + pythonImportsCheck = [ "aioambient" ]; + + meta = with lib; { + description = "Python library for the Ambient Weather API"; + homepage = "https://github.com/bachya/aioambient"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 17f6624c42e..ab0725fb9bf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -202,6 +202,8 @@ in { agent-py = callPackage ../development/python-modules/agent-py { }; + aioambient = callPackage ../development/python-modules/aioambient { }; + aioamqp = callPackage ../development/python-modules/aioamqp { }; ailment = callPackage ../development/python-modules/ailment { }; From c309992f7ad530509957de53e54c386cdf2c6eed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 11:04:00 +0100 Subject: [PATCH 04/21] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 40779f4bc19..f248427a3c9 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -27,7 +27,7 @@ "alpha_vantage" = ps: with ps; [ ]; # missing inputs: alpha_vantage "amazon_polly" = ps: with ps; [ boto3 ]; "ambiclimate" = ps: with ps; [ aiohttp-cors ambiclimate ]; - "ambient_station" = ps: with ps; [ ]; # missing inputs: aioambient + "ambient_station" = ps: with ps; [ aioambient ]; "amcrest" = ps: with ps; [ amcrest ha-ffmpeg ]; "ampio" = ps: with ps; [ ]; # missing inputs: asmog "android_ip_webcam" = ps: with ps; [ ]; # missing inputs: pydroid-ipcam From f6675420fc782198cc7a286c9bc95c3abc25c761 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 11:18:49 +0100 Subject: [PATCH 05/21] python3Packages.pydaikin: init at 2.4.1 --- .../python-modules/pydaikin/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/pydaikin/default.nix diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix new file mode 100644 index 00000000000..209ef3dbc23 --- /dev/null +++ b/pkgs/development/python-modules/pydaikin/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromBitbucket +, freezegun +, netifaces +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +, urllib3 +}: + +buildPythonPackage rec { + pname = "pydaikin"; + version = "2.4.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromBitbucket { + owner = "mustang51"; + repo = pname; + rev = "v${version}"; + sha256 = "1624adp4lqd1n9flnf0wqrcibml2nd19ga3fmxzjg4x5z6767bs3"; + }; + + propagatedBuildInputs = [ + aiohttp + netifaces + urllib3 + ]; + + checkInputs = [ + freezegun + pytest-aiohttp + pytestCheckHook + ]; + + pythonImportsCheck = [ "pydaikin" ]; + + meta = with lib; { + description = "Python Daikin HVAC appliances interface"; + homepage = "https://bitbucket.org/mustang51/pydaikin"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 17f6624c42e..916d83a6e7f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5342,6 +5342,8 @@ in { pycxx = callPackage ../development/python-modules/pycxx { }; + pydaikin = callPackage ../development/python-modules/pydaikin { }; + pydantic = callPackage ../development/python-modules/pydantic { }; pydbus = callPackage ../development/python-modules/pydbus { }; From be095d60ba98bbd0c5b686723e93a5a81340e684 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 11:19:41 +0100 Subject: [PATCH 06/21] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 40779f4bc19..d8ffed98f89 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -145,7 +145,7 @@ "crimereports" = ps: with ps; [ ]; # missing inputs: crimereports "cups" = ps: with ps; [ pycups ]; "currencylayer" = ps: with ps; [ ]; - "daikin" = ps: with ps; [ ]; # missing inputs: pydaikin + "daikin" = ps: with ps; [ pydaikin ]; "danfoss_air" = ps: with ps; [ ]; # missing inputs: pydanfossair "darksky" = ps: with ps; [ python-forecastio ]; "datadog" = ps: with ps; [ datadog ]; From a55626e726c51f2b0c483d8ade0ae6df7af541a7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Feb 2021 10:34:47 +0000 Subject: [PATCH 07/21] python37Packages.google-cloud-bigtable: 1.6.1 -> 1.7.0 --- .../python-modules/google-cloud-bigtable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 93cbc22b7cd..786250ce9e1 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "1.6.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "ace4ff7c6e00fb7d86963503615db85336b6484339f5774bd8c589df224772a8"; + sha256 = "90bd53a19c33c34101b8567c82a6dc0386af4118d70e1ad69b49375358a21aa6"; }; checkInputs = [ pytest mock ]; From a9927dfc274839bc5b1b67ac7115aee09b83120b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 14:04:02 +0100 Subject: [PATCH 08/21] python3Packages.radiotherm: init at 2.1.0 --- .../python-modules/radiotherm/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/radiotherm/default.nix diff --git a/pkgs/development/python-modules/radiotherm/default.nix b/pkgs/development/python-modules/radiotherm/default.nix new file mode 100644 index 00000000000..9cefe8839c1 --- /dev/null +++ b/pkgs/development/python-modules/radiotherm/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "radiotherm"; + version = "2.1.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "mhrivnak"; + repo = pname; + rev = version; + sha256 = "0p37pc7l2malmjfkdlh4q2cfa6dqpsk1rah2j2xil0pj57ai6bks"; + }; + + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "radiotherm" ]; + + meta = with lib; { + description = "Python library for Wifi Radiothermostat"; + homepage = "https://github.com/mhrivnak/radiotherm"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 17f6624c42e..bf3d495ea1d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6673,6 +6673,8 @@ in { radio_beam = callPackage ../development/python-modules/radio_beam { }; + radiotherm = callPackage ../development/python-modules/radiotherm { }; + radish-bdd = callPackage ../development/python-modules/radish-bdd { }; rainbowstream = callPackage ../development/python-modules/rainbowstream { }; From 2f9d1e1850b01b1eba917d4651fefdd0280f7afe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 14:04:45 +0100 Subject: [PATCH 09/21] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 40779f4bc19..7e473e45157 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -658,7 +658,7 @@ "qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch "rachio" = ps: with ps; [ aiohttp-cors hass-nabucasa rachiopy ]; "radarr" = ps: with ps; [ ]; - "radiotherm" = ps: with ps; [ ]; # missing inputs: radiotherm + "radiotherm" = ps: with ps; [ radiotherm ]; "rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird "raincloud" = ps: with ps; [ ]; # missing inputs: raincloudy "rainforest_eagle" = ps: with ps; [ ]; # missing inputs: eagle200_reader uEagle From 77092e21aaaed0f11eec4ad4464caaec0f281149 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 14:13:21 +0100 Subject: [PATCH 10/21] python3Packages.pyrisco: init 0.3.1 --- .../python-modules/pyrisco/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/pyrisco/default.nix diff --git a/pkgs/development/python-modules/pyrisco/default.nix b/pkgs/development/python-modules/pyrisco/default.nix new file mode 100644 index 00000000000..b9df9d36d41 --- /dev/null +++ b/pkgs/development/python-modules/pyrisco/default.nix @@ -0,0 +1,32 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyrisco"; + version = "0.3.1"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "OnFreund"; + repo = pname; + rev = "v${version}"; + sha256 = "1im29h4rxnp98aqzgzjj5i8jv2h5zw9c5yx8xxzl4cmr3yila9zw"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pyrisco" ]; + + meta = with lib; { + description = "Python interface to Risco alarm systems through Risco Cloud"; + homepage = "https://github.com/OnFreund/pyrisco"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 17f6624c42e..f519ca456e7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5880,6 +5880,8 @@ in { pyres = callPackage ../development/python-modules/pyres { }; + pyrisco = callPackage ../development/python-modules/pyrisco { }; + pyRFC3339 = callPackage ../development/python-modules/pyrfc3339 { }; PyRMVtransport = callPackage ../development/python-modules/PyRMVtransport { }; From 5ac95f49b9b88b4149da66821eb98ebe40941582 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 14:14:13 +0100 Subject: [PATCH 11/21] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 40779f4bc19..fcb2df85d41 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -681,7 +681,7 @@ "rfxtrx" = ps: with ps; [ ]; # missing inputs: pyRFXtrx "ring" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: ring_doorbell "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api - "risco" = ps: with ps; [ ]; # missing inputs: pyrisco + "risco" = ps: with ps; [ pyrisco ]; "rmvtransport" = ps: with ps; [ PyRMVtransport ]; "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "roku" = ps: with ps; [ ]; # missing inputs: rokuecp From 5d1157f2d020d58951b3dcf4b251c3764ab6ce70 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 14:22:25 +0100 Subject: [PATCH 12/21] python3Packages.pytrafikverket: init at 0.1.6.2 --- .../python-modules/pytrafikverket/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/pytrafikverket/default.nix diff --git a/pkgs/development/python-modules/pytrafikverket/default.nix b/pkgs/development/python-modules/pytrafikverket/default.nix new file mode 100644 index 00000000000..0a65a960fb7 --- /dev/null +++ b/pkgs/development/python-modules/pytrafikverket/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, async-timeout +, lxml +}: + +buildPythonPackage rec { + pname = "pytrafikverket"; + version = "0.1.6.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hrjsw53ixgmhsiszdrzzh0wma705nrhq8npzacsyaf43r29zvqy"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + lxml + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pytrafikverket" ]; + + meta = with lib; { + description = "Python library to manage Etekcity Devices and Levoit Air Purifier"; + homepage = "https://github.com/endor-force/pytrafikverket"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 17f6624c42e..4bd13447513 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6489,6 +6489,8 @@ in { pytorchWithoutCuda = self.pytorch.override { cudaSupport = false; }; + pytrafikverket = callPackage ../development/python-modules/pytrafikverket { }; + pytrends = callPackage ../development/python-modules/pytrends { }; pytricia = callPackage ../development/python-modules/pytricia { }; From 1d89821804f89d8d3cae8073670763cc4fdf42d2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 14:24:17 +0100 Subject: [PATCH 13/21] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 40779f4bc19..38e1c5841ed 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -858,8 +858,8 @@ "traccar" = ps: with ps; [ aiohttp-cors stringcase ]; # missing inputs: pytraccar "trackr" = ps: with ps; [ ]; # missing inputs: pytrackr "tradfri" = ps: with ps; [ ]; # missing inputs: pytradfri[async] - "trafikverket_train" = ps: with ps; [ ]; # missing inputs: pytrafikverket - "trafikverket_weatherstation" = ps: with ps; [ ]; # missing inputs: pytrafikverket + "trafikverket_train" = ps: with ps; [ pytrafikverket ]; + "trafikverket_weatherstation" = ps: with ps; [ pytrafikverket ]; "transmission" = ps: with ps; [ transmissionrpc ]; "transport_nsw" = ps: with ps; [ ]; # missing inputs: PyTransportNSW "travisci" = ps: with ps; [ ]; # missing inputs: TravisPy From ef25c7178ae8d028ddeb2ef3b9acc6f7d029ae89 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 14:46:28 +0100 Subject: [PATCH 14/21] python3Packages.proxmoxer: init at 1.1.1 --- .../python-modules/proxmoxer/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/proxmoxer/default.nix diff --git a/pkgs/development/python-modules/proxmoxer/default.nix b/pkgs/development/python-modules/proxmoxer/default.nix new file mode 100644 index 00000000000..cdbec22bc1f --- /dev/null +++ b/pkgs/development/python-modules/proxmoxer/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, nose +, paramiko +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "proxmoxer"; + version = "1.1.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "09fz8zbxjaly9zqksvq6cqp66plbsyjsmndy4g25ryys45siz1ny"; + }; + + propagatedBuildInputs = [ + paramiko + requests + ]; + + checkInputs = [ + mock + nose + pytestCheckHook + ]; + + # Tests require openssh_wrapper which is outdated and not available + pytestFlagsArray = [ "tests/paramiko_tests.py" ]; + pythonImportsCheck = [ "proxmoxer" ]; + + meta = with lib; { + description = "Python wrapper for Proxmox API v2"; + homepage = "https://github.com/proxmoxer/proxmoxer"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 17f6624c42e..155220a4f45 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5117,6 +5117,8 @@ in { prox-tv = callPackage ../development/python-modules/prox-tv { }; + proxmoxer = callPackage ../development/python-modules/proxmoxer { }; + psautohint = callPackage ../development/python-modules/psautohint { }; psd-tools = callPackage ../development/python-modules/psd-tools { }; From af9db7b001163a80a879eebad0d18f4300fe0e45 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 14:49:47 +0100 Subject: [PATCH 15/21] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 40779f4bc19..549bacecc21 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -637,7 +637,7 @@ "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ]; "prowl" = ps: with ps; [ ]; "proximity" = ps: with ps; [ ]; - "proxmoxve" = ps: with ps; [ ]; # missing inputs: proxmoxer + "proxmoxve" = ps: with ps; [ proxmoxer ]; "proxy" = ps: with ps; [ pillow ]; "ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen "pulseaudio_loopback" = ps: with ps; [ pulsectl ]; From d38297f734d26bd5148498eefcc63995e00e6c1a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 21:27:20 +0100 Subject: [PATCH 16/21] python3Packages.pymsteams: init at 0.1.14 --- .../python-modules/pymsteams/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/pymsteams/default.nix diff --git a/pkgs/development/python-modules/pymsteams/default.nix b/pkgs/development/python-modules/pymsteams/default.nix new file mode 100644 index 00000000000..a475d074efd --- /dev/null +++ b/pkgs/development/python-modules/pymsteams/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "pymsteams"; + version = "0.1.14"; + + src = fetchFromGitHub { + owner = "rveachkc"; + repo = pname; + rev = version; + sha256 = "19gnsjzf3kwcwp2rwa30zpqjqgxb9plgcsx7fqbmxnrxgw99fyqx"; + }; + + propagatedBuildInputs = [ requests ]; + + # Tests require network access + doCheck = false; + pythonImportsCheck = [ "pymsteams" ]; + + meta = with lib; { + description = "Python module to interact with Microsoft Teams"; + homepage = "https://github.com/rveachkc/pymsteams"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 17f6624c42e..2d1e6663f9a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5670,6 +5670,8 @@ in { pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 + pymsteams = callPackage ../development/python-modules/pymsteams { }; + py-multibase = callPackage ../development/python-modules/py-multibase { }; py-multicodec = callPackage ../development/python-modules/py-multicodec { }; From d8b5bc93feada5f2af057ed09f1b3d32684ce180 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 21:27:41 +0100 Subject: [PATCH 17/21] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 40779f4bc19..22e58a9b4ea 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -518,7 +518,7 @@ "mqtt_json" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "mqtt_room" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "mqtt_statestream" = ps: with ps; [ aiohttp-cors paho-mqtt ]; - "msteams" = ps: with ps; [ ]; # missing inputs: pymsteams + "msteams" = ps: with ps; [ pymsteams ]; "mvglive" = ps: with ps; [ PyMVGLive ]; "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy "mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi From 6304d91d91b6c9ef5e5d4cc4a2e1af1ab812a605 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Feb 2021 21:42:00 +0000 Subject: [PATCH 18/21] python37Packages.josepy: 1.6.0 -> 1.7.0 --- pkgs/development/python-modules/josepy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index b6e6f47b64b..3f30da8da9b 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "josepy"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0aab1c3ceffe045e7fd5bcfe7685e27e9d2758518d9ba7116b5de34087e70bf5"; + sha256 = "d265414fa16d7a8b7a1d1833b4ebb19a22bd0deae5d44413cf9040fd8491d85a"; }; postPatch = '' From b7f4d3d949b6a9f73f475fba3d839a3ea5b5708e Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Sat, 13 Feb 2021 17:56:04 -0500 Subject: [PATCH 19/21] python3Packages.humanize: cleanup --- pkgs/development/python-modules/humanize/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index b6f78e5cf8f..94cef6d07f1 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -2,8 +2,10 @@ , buildPythonPackage , fetchPypi , isPy27 -, mock , setuptools_scm +, setuptools +, pytestCheckHook +, freezegun }: buildPythonPackage rec { @@ -17,16 +19,14 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; - checkInputs = [ mock ]; - - doCheck = false; + propagatedBuildInputs = [ setuptools ]; + checkInputs = [ pytestCheckHook freezegun ]; meta = with lib; { description = "Python humanize utilities"; homepage = "https://github.com/jmoiron/humanize"; license = licenses.mit; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; + maintainers = with maintainers; [ rmcgibbo ]; }; } From 04ef00987a19dee966a58d871a3aa8c0a7965190 Mon Sep 17 00:00:00 2001 From: pasqui23 Date: Sun, 14 Feb 2021 01:06:01 +0100 Subject: [PATCH 20/21] nixos/switcheroo-control: add to modules-list.nix (#113052) --- nixos/modules/module-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5242ac05357..c7e83a95de8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -80,6 +80,7 @@ ./hardware/video/displaylink.nix ./hardware/video/hidpi.nix ./hardware/video/nvidia.nix + ./hardware/video/switcheroo-control.nix ./hardware/video/uvcvideo/default.nix ./hardware/video/webcam/facetimehd.nix ./hardware/xpadneo.nix From 89147ab52368e84136bd0303b41673193bc683e8 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 14 Feb 2021 01:15:13 +0100 Subject: [PATCH 21/21] python3Packages.fontparts: 0.9.7 -> 0.9.9 (#112992) --- pkgs/development/python-modules/fontparts/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix index c694c15f557..9a57b1574ac 100644 --- a/pkgs/development/python-modules/fontparts/default.nix +++ b/pkgs/development/python-modules/fontparts/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "fontParts"; - version = "0.9.7"; + version = "0.9.9"; src = fetchPypi { inherit pname version; - sha256 = "183y1y11bqd4ky4anyv40qbvsm6i90gnydqzrjg7syspjsqvfqgy"; + sha256 = "1iz04kpxgc5fx2rl4585hr1vp4cdajqbddlskkhlmzkn9hvz528i"; extension = "zip"; }; @@ -28,7 +28,9 @@ buildPythonPackage rec { ]; checkPhase = '' + runHook preCheck ${python.interpreter} Lib/fontParts/fontshell/test.py + runHook postCheck ''; checkInputs = [ pytest ];