From 0897eb31327ff0132ca944cd47e6ecb9cac053c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 29 Apr 2021 20:39:42 +0200 Subject: [PATCH 1/2] python3Packages.ha-ffmpeg: does not depend on ffmpeg_3 The path to the binary is specified in the configuration: https://www.home-assistant.io/integrations/ffmpeg#ffmpeg_bin --- pkgs/development/python-modules/ha-ffmpeg/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index 84810fd2b532..ce1e8a9d2377 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy3k -, ffmpeg_3, async-timeout }: +, async-timeout }: buildPythonPackage rec { pname = "ha-ffmpeg"; @@ -12,8 +12,6 @@ buildPythonPackage rec { sha256 = "8d92f2f5790da038d828ac862673e0bb43e8e972e4c70b1714dd9a0fb776c8d1"; }; - buildInputs = [ ffmpeg_3 ]; - propagatedBuildInputs = [ async-timeout ]; # only manual tests @@ -23,6 +21,6 @@ buildPythonPackage rec { homepage = "https://github.com/pvizeli/ha-ffmpeg"; description = "Library for home-assistant to handle ffmpeg"; license = licenses.bsd3; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = teams.home-assistant.members; }; } From b33572a49f1c246acd8d1ae1266ea3b2616c5d5c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Apr 2021 00:24:49 +0200 Subject: [PATCH 2/2] python3Packages.ha-ffmpeg: add pythonImportsChecks --- pkgs/development/python-modules/ha-ffmpeg/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index ce1e8a9d2377..9fd1295733c4 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -17,6 +17,12 @@ buildPythonPackage rec { # only manual tests doCheck = false; + pythonImportsCheck = [ + "haffmpeg.camera" + "haffmpeg.sensor" + "haffmpeg.tools" + ]; + meta = with lib; { homepage = "https://github.com/pvizeli/ha-ffmpeg"; description = "Library for home-assistant to handle ffmpeg";