From fe1a3630227cb1e6cf936118119e1921c0a8920a Mon Sep 17 00:00:00 2001 From: Graham Bennett Date: Tue, 23 Feb 2021 22:22:52 +0000 Subject: [PATCH 1/2] python3Packages.ring_doorbell: init at 0.7.0 --- .../python-modules/ring-doorbell/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/ring-doorbell/default.nix diff --git a/pkgs/development/python-modules/ring-doorbell/default.nix b/pkgs/development/python-modules/ring-doorbell/default.nix new file mode 100644 index 00000000000..f70e4921b9e --- /dev/null +++ b/pkgs/development/python-modules/ring-doorbell/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, oauthlib +, pytestCheckHook +, pytz +, requests +, requests-mock +, requests_oauthlib +}: + +buildPythonPackage rec { + pname = "ring-doorbell"; + version = "0.7.0"; + disabled = !isPy3k; + + src = fetchPypi { + pname = "ring_doorbell"; + inherit version; + sha256 = "1qnx9q9rzxhh0pygl3f9bg21b5zv7csv9h1w4zngdvsphbs0yiwg"; + }; + + propagatedBuildInputs = [ + oauthlib + pytz + requests + requests_oauthlib + ]; + + checkInputs = [ + pytestCheckHook + requests-mock + ]; + + pythonImportsCheck = [ "ring_doorbell" ]; + + meta = with lib; { + homepage = "https://github.com/tchellomello/python-ring-doorbell"; + description = "A Python library to communicate with Ring Door Bell (https://ring.com/)"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ graham33 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 48e571147c8..9871d1c4462 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6927,6 +6927,8 @@ in { rig = callPackage ../development/python-modules/rig { }; + ring-doorbell = callPackage ../development/python-modules/ring-doorbell { }; + ripser = callPackage ../development/python-modules/ripser { }; rising = callPackage ../development/python-modules/rising { }; From cb55068397db15974a0d0d0bd79ffb14d6b99229 Mon Sep 17 00:00:00 2001 From: Graham Bennett Date: Wed, 24 Feb 2021 19:10:59 +0000 Subject: [PATCH 2/2] home-assistant: add ring-doorbell dependency For the ring integration. This is currently pinned back to 0.6.2 to avoid an upstream bug in 0.7.0. --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 1dc8490c3c2..a0e9c01c7cb 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -679,7 +679,7 @@ "rest_command" = ps: with ps; [ ]; "rflink" = ps: with ps; [ ]; # missing inputs: rflink "rfxtrx" = ps: with ps; [ ]; # missing inputs: pyRFXtrx - "ring" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: ring_doorbell + "ring" = ps: with ps; [ ha-ffmpeg ring-doorbell ]; "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api "risco" = ps: with ps; [ pyrisco ]; "rmvtransport" = ps: with ps; [ PyRMVtransport ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 2ddd4a45323..8931bf65b5c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -23,6 +23,11 @@ let (mkOverride "astral" "1.10.1" "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1") + # Pinned due to bug in ring-doorbell 0.7.0 + # https://github.com/tchellomello/python-ring-doorbell/issues/240 + (mkOverride "ring-doorbell" "0.6.2" + "fbd537722a27b3b854c26506d894b7399bb8dc57ff36083285971227a2d46560") + # hass-frontend does not exist in python3.pkgs (self: super: { hass-frontend = self.callPackage ./frontend.nix { };