summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2020-10-23 21:22:32 +0200
committermakefu <github@syntax-fehler.de>2020-10-23 21:22:40 +0200
commit0ea3894a845e2e5dc59b9352402a9810e3e9b813 (patch)
tree345e8bce72c3ab700bec15dd7a4f4f080ee80ade
parente8b6cc0587929a7ebd0d00f83d298640b20b055f (diff)
ma ham: use upstream androidtv
-rw-r--r--makefu/2configs/ham/androidtv/adbshell.nix38
-rw-r--r--makefu/2configs/ham/androidtv/default.nix30
-rw-r--r--makefu/2configs/ham/androidtv/purepythonadb.nix21
-rw-r--r--makefu/2configs/ham/default.nix9
4 files changed, 5 insertions, 93 deletions
diff --git a/makefu/2configs/ham/androidtv/adbshell.nix b/makefu/2configs/ham/androidtv/adbshell.nix
deleted file mode 100644
index c2844eb4e..000000000
--- a/makefu/2configs/ham/androidtv/adbshell.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, cryptography
-, pyasn1
-, rsa
-, pycryptodome
-}:
-
-buildPythonPackage rec {
- pname = "adb_shell";
- version = "0.1.3";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "16wb8n4fsh465fjlbsxi83xpi7xklaf28s9568bsb3nkyvfvl58h";
- };
-
- propagatedBuildInputs = [
- cryptography
- pyasn1
- rsa
- ];
-
- # tests are not part of pypi package
- doCheck = false;
-
- checkInputs = [
- pycryptodome
- ];
-
- meta = with lib; {
- description = "A Python implementation of ADB with shell and FileSync functionality";
- homepage = https://github.com/JeffLIrion/adb_shell/;
- license = licenses.mit;
- # maintainers = [ maintainers. ];
- };
-}
diff --git a/makefu/2configs/ham/androidtv/default.nix b/makefu/2configs/ham/androidtv/default.nix
deleted file mode 100644
index 2a0bec484..000000000
--- a/makefu/2configs/ham/androidtv/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib
-, buildPythonPackage
-, callPackage
-, fetchPypi
-}:
-
-buildPythonPackage rec {
- pname = "androidtv";
- version = "0.0.41";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1nch08g47qjgdacl03w7kczx2gajx6nkazgxdzbgn1vghrg6x2zw";
- };
-
- propagatedBuildInputs = [
- (callPackage ./adbshell.nix {})
- (callPackage ./purepythonadb.nix {})
- ];
-
- # tests are not packaged in pypi release
- doCheck = false;
-
- meta = with lib; {
- description = "Communicate with an Android TV or Fire TV device via ADB over a network";
- homepage = https://github.com/JeffLIrion/python-androidtv/;
- license = licenses.mit;
- # maintainers = [ maintainers. ];
- };
-}
diff --git a/makefu/2configs/ham/androidtv/purepythonadb.nix b/makefu/2configs/ham/androidtv/purepythonadb.nix
deleted file mode 100644
index c9b1ff5e8..000000000
--- a/makefu/2configs/ham/androidtv/purepythonadb.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-}:
-
-buildPythonPackage rec {
- pname = "pure-python-adb";
- version = "0.2.2.dev0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1xigv6c8xyb4g852nr3smz0137rnp81jvlikza071y7rc6pdzwza";
- };
-
- meta = with lib; {
- description = "Pure python implementation of the adb client";
- homepage = https://github.com/Swind/pure-python-adb;
- license = licenses.mit;
- # maintainers = [ maintainers. ];
- };
-}
diff --git a/makefu/2configs/ham/default.nix b/makefu/2configs/ham/default.nix
index 8311a1a76..3a6d1952f 100644
--- a/makefu/2configs/ham/default.nix
+++ b/makefu/2configs/ham/default.nix
@@ -34,14 +34,13 @@ in {
installCheckPhase = ":";
})).override {
extraPackages = ps: with ps; [
- python-forecastio jsonrpc-async jsonrpc-websocket mpd2 pkgs.picotts
- (callPackage ./androidtv {})
+ python-forecastio jsonrpc-async jsonrpc-websocket mpd2 pkgs.picotts androidtv
];
};
config = {
influxdb = {
database = "ham";
- host = "localhost:8086";
+ host = "localhost";
tags = {
instance = "omo";
source = "hass";
@@ -74,7 +73,9 @@ in {
service_name = "google_say";
}
];
-
+ api = {};
+ esphome = {};
+ camera = [];
telegram_bot = [
# secrets file: {
# "platform": "broadcast",