From 3f202e6ed5725935fb3737536558c28497152b23 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 17 Nov 2020 20:03:10 +0100 Subject: shack/mqtt_sub: use python3 instead of 3.5 --- krebs/2configs/shack/mqtt_sub.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/2configs/shack/mqtt_sub.nix b/krebs/2configs/shack/mqtt_sub.nix index bd0b6df85..af2bc1e66 100644 --- a/krebs/2configs/shack/mqtt_sub.nix +++ b/krebs/2configs/shack/mqtt_sub.nix @@ -10,7 +10,7 @@ let sha256 = "1334jbbzlqizyp7zcn4hdswhhrnkj1p4p435n5nph82lzffrsi44"; }; buildInputs = [ - (pkgs.python35.withPackages (pythonPackages: with pythonPackages; [ + (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [ docopt paho-mqtt ])) -- cgit v1.2.3 From a06144cc89556519ee5ede5c22fb02c9596cfaca Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 17 Nov 2020 20:07:20 +0100 Subject: ma gum.r: disable gitlab-runner --- makefu/1systems/gum/config.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index d0ba1a3c6..f65c6672b 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -82,8 +82,12 @@ in { # ci # + + ###### Shack ##### # - + # + + -- cgit v1.2.3 From 9d99500e0922c5577c32bcb77f88d9edc472ffaa Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 17 Nov 2020 20:16:19 +0100 Subject: ma hw/tp-x2x0: use utillinux instead of rfkill package --- makefu/2configs/hw/tp-x2x0.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefu/2configs/hw/tp-x2x0.nix b/makefu/2configs/hw/tp-x2x0.nix index f4578bf77..b997a9eec 100644 --- a/makefu/2configs/hw/tp-x2x0.nix +++ b/makefu/2configs/hw/tp-x2x0.nix @@ -54,6 +54,6 @@ powerManagement.resumeCommands = '' - ${pkgs.rfkill}/bin/rfkill unblock all + ${pkgs.utillinux}/bin/rfkill unblock all ''; } -- cgit v1.2.3 From 064d51001d2daa17408fdf0311c763e05e0fe9c4 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 17 Nov 2020 21:32:24 +0100 Subject: shack/glados: disable dwd_pollen --- krebs/2configs/shack/glados/default.nix | 19 +++------------ krebs/2configs/shack/glados/deps/dwd_pollen.nix | 32 ------------------------- 2 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 krebs/2configs/shack/glados/deps/dwd_pollen.nix diff --git a/krebs/2configs/shack/glados/default.nix b/krebs/2configs/shack/glados/default.nix index f47bca2db..04843cb24 100644 --- a/krebs/2configs/shack/glados/default.nix +++ b/krebs/2configs/shack/glados/default.nix @@ -21,23 +21,10 @@ in { ''; }; }; - services.home-assistant = let - dwd_pollen = pkgs.fetchFromGitHub { - owner = "marcschumacher"; - repo = "dwd_pollen"; - rev = "0.1"; - sha256 = "1af2mx99gv2hk1ad53g21fwkdfdbymqcdl3jvzd1yg7dgxlkhbj1"; - }; - in { + services.home-assistant = + { enable = true; - package = (pkgs.home-assistant.overrideAttrs (old: { # TODO: find correct python package - installCheckPhase = '' - echo LOLLLLLLLLLLLLLL - ''; - postInstall = '' - cp -r ${dwd_pollen} $out/lib/python3.7/site-packages/homeassistant/components/dwd_pollen - ''; - })).override { + package = pkgs.home-assistant.override { extraPackages = ps: with ps; [ python-forecastio jsonrpc-async jsonrpc-websocket mpd2 pkgs.picotts ]; diff --git a/krebs/2configs/shack/glados/deps/dwd_pollen.nix b/krebs/2configs/shack/glados/deps/dwd_pollen.nix deleted file mode 100644 index 39d9c3069..000000000 --- a/krebs/2configs/shack/glados/deps/dwd_pollen.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, python -, voluptuous -}: - -buildPythonPackage rec { - format = "other"; - pname = "dwd_pollen"; - version = "0.1"; - - src = fetchFromGitHub { - owner = "marcschumacher"; - repo = "dwd_pollen"; - rev = version; - sha256 = "1af2mx99gv2hk1ad53g21fwkdfdbymqcdl3jvzd1yg7dgxlkhbj1"; - }; - propagatedBuildInputs = [ - voluptuous - ]; - installPhase = '' - install -D -t $out/${python.sitePackages}/homeassistant/components/sensor/dwd_pollen * - ''; - - meta = with lib; { - description = "Home Assistant component to retrieve Pollen data from DWD (Germany)"; - homepage = https://github.com/marcschumacher/dwd_pollen; - license = licenses.mit; - maintainers = [ maintainers.makefu ]; - }; -} -- cgit v1.2.3