From 0add05081f3319ada88a52bfb7b1c28ae0dcdc4e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 00:06:51 +0100 Subject: [PATCH] home-assistant-custom-lovelace-modules: set up autocalling --- .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../bubble-card/{default.nix => package.nix} | 0 .../button-card/{default.nix => package.nix} | 0 .../card-mod/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../custom-lovelace-modules/default.nix | 52 ------------------- .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../mushroom/{default.nix => package.nix} | 0 .../rmv-card/{default.nix => package.nix} | 0 .../sankey-chart/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../vacuum-card/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../weather-card/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 pkgs/top-level/all-packages.nix | 6 ++- 23 files changed, 4 insertions(+), 54 deletions(-) rename pkgs/servers/home-assistant/custom-lovelace-modules/apexcharts-card/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/button-card/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/decluttering-card/{default.nix => package.nix} (100%) delete mode 100644 pkgs/servers/home-assistant/custom-lovelace-modules/default.nix rename pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/rmv-card/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/valetudo-map-card/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/weather-card/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/{default.nix => package.nix} (100%) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/apexcharts-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/apexcharts-card/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/apexcharts-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/apexcharts-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/button-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/decluttering-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/decluttering-card/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/decluttering-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/decluttering-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix deleted file mode 100644 index 8a51d530a0bf..000000000000 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - pkgs, - callPackage, -}: - -{ - apexcharts-card = callPackage ./apexcharts-card { }; - - atomic-calendar-revive = callPackage ./atomic-calendar-revive { }; - - bubble-card = callPackage ./bubble-card { }; - - button-card = callPackage ./button-card { }; - - card-mod = callPackage ./card-mod { }; - - decluttering-card = callPackage ./decluttering-card { }; - - hourly-weather = callPackage ./hourly-weather { }; - - lg-webos-remote-control = callPackage ./lg-webos-remote-control { }; - - light-entity-card = callPackage ./light-entity-card { }; - - mini-graph-card = callPackage ./mini-graph-card { }; - - mini-media-player = callPackage ./mini-media-player { }; - - multiple-entity-row = callPackage ./multiple-entity-row { }; - - mushroom = callPackage ./mushroom { }; - - rmv-card = callPackage ./rmv-card { }; - - sankey-chart = callPackage ./sankey-chart { }; - - template-entity-row = callPackage ./template-entity-row { }; - - universal-remote-card = callPackage ./universal-remote-card { }; - - vacuum-card = callPackage ./vacuum-card { }; - - valetudo-map-card = callPackage ./valetudo-map-card { }; - - weather-card = callPackage ./weather-card { }; - - zigbee2mqtt-networkmap = callPackage ./zigbee2mqtt-networkmap { }; -} -// lib.optionalAttrs pkgs.config.allowAliases { - android-tv-card = lib.warnOnInstantiate "`home-assistant-custom-lovelace-modules.android-tv-card` has been renamed to `universal-remote-card`" pkgs.home-assistant-custom-lovelace-modules.universal-remote-card; -} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/rmv-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/rmv-card/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/rmv-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/rmv-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/valetudo-map-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/valetudo-map-card/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/valetudo-map-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/valetudo-map-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/weather-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/weather-card/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/weather-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/weather-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3c331d76a5f..5e835e45dd48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11602,8 +11602,10 @@ with pkgs; inherit (home-assistant.python.pkgs) callPackage; directory = ../servers/home-assistant/custom-components; }); - home-assistant-custom-lovelace-modules = lib.recurseIntoAttrs - (callPackage ../servers/home-assistant/custom-lovelace-modules {}); + home-assistant-custom-lovelace-modules = lib.recurseIntoAttrs (lib.packagesFromDirectoryRecursive { + inherit callPackage; + directory = ../servers/home-assistant/custom-lovelace-modules; + }); home-assistant-cli = callPackage ../servers/home-assistant/cli.nix { };