From 6e51e12d4a5dff9af13882fbbca06af29074fb0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 13 Jun 2021 21:05:57 +0200 Subject: [PATCH 1/4] pythonPackages.vincenty: init at 0.1.4 --- .../python-modules/vincenty/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/vincenty/default.nix diff --git a/pkgs/development/python-modules/vincenty/default.nix b/pkgs/development/python-modules/vincenty/default.nix new file mode 100644 index 000000000000..dbf174bd2a72 --- /dev/null +++ b/pkgs/development/python-modules/vincenty/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "vincenty"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "maurycyp"; + repo = "vincenty"; + rev = version; + sha256 = "1li8gv0zb1pdbxdybgaykm38lqbkb5dr7rph6zs1k4k3sh15ldw3"; + }; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "vincenty" ]; + + meta = with lib; { + description = "Calculate the geographical distance between 2 points with extreme accuracy"; + homepage = "https://github.com/maurycyp/vincenty"; + license = licenses.unlicense; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 20e9481450be..1b50b8ad1b43 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8765,6 +8765,8 @@ in { viewstate = callPackage ../development/python-modules/viewstate { }; + vincenty = callPackage ../development/python-modules/vincenty { }; + vine = callPackage ../development/python-modules/vine { }; virtkey = callPackage ../development/python-modules/virtkey { }; From 71f8d097de3ffa390625e77c2ea603674561df2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 13 Jun 2021 21:10:43 +0200 Subject: [PATCH 2/4] python3Packages.buienradar: init at 1.0.4 --- .../python-modules/buienradar/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/buienradar/default.nix diff --git a/pkgs/development/python-modules/buienradar/default.nix b/pkgs/development/python-modules/buienradar/default.nix new file mode 100644 index 000000000000..a366e0cdd3bc --- /dev/null +++ b/pkgs/development/python-modules/buienradar/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, docopt +, pytz +, requests +, setuptools +, vincenty +, xmltodict +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "buienradar"; + version = "1.0.4"; + + disabled = pythonOlder "3.4"; + + src = fetchFromGitHub { + owner = "mjj4791"; + repo = "python-buienradar"; + rev = version; + sha256 = "1s0m5x7wdvzzsm797lh6531k614ybh7z0cikxjxqw377mivpz4wq"; + }; + + propagatedBuildInputs = [ + docopt + pytz + requests + setuptools + vincenty + xmltodict + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # require network connection + "test_rain_data" + "test_json_data" + "test_xml_data" + ]; + + pythonImportsCheck = [ + "buienradar.buienradar" + "buienradar.constants" + ]; + + meta = with lib; { + description = "Library and CLI tools for interacting with buienradar"; + homepage = "https://github.com/mjj4791/python-buienradar"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b50b8ad1b43..80aa7dfb28f4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1186,6 +1186,8 @@ in { bugzilla = callPackage ../development/python-modules/bugzilla { }; + buienradar = callPackage ../development/python-modules/buienradar { }; + buildbot = callPackage ../development/python-modules/buildbot { }; buildbot-ui = self.buildbot.withPlugins (with self.buildbot-plugins; [ www ]); From 60114083e36fd4bb5d408c16ac034df923b05917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 13 Jun 2021 21:12:28 +0200 Subject: [PATCH 3/4] home-assistant: update component-packages.nix --- 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 df4c462350c3..6f6e1ffe2abf 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -106,7 +106,7 @@ "bsblan" = ps: with ps; [ bsblan ]; "bt_home_hub_5" = ps: with ps; [ ]; # missing inputs: bthomehub5-devicelist "bt_smarthub" = ps: with ps; [ ]; # missing inputs: btsmarthub_devicelist - "buienradar" = ps: with ps; [ ]; # missing inputs: buienradar + "buienradar" = ps: with ps; [ buienradar ]; "caldav" = ps: with ps; [ caldav ]; "calendar" = ps: with ps; [ aiohttp-cors ]; "camera" = ps: with ps; [ aiohttp-cors ]; From 5242e9adaaac2f15582d49aed4aef51cb28156bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 13 Jun 2021 21:24:57 +0200 Subject: [PATCH 4/4] home-assistant: test buienradar component --- 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 a6deea717568..2d11f5ad424f 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -311,6 +311,7 @@ in with py.pkgs; buildPythonApplication rec { "broadlink" "brother" "bsblan" + "buienradar" "caldav" "calendar" "camera"