diff --git a/pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix b/pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix rename to pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/alarmo/default.nix b/pkgs/servers/home-assistant/custom-components/alarmo/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/alarmo/default.nix rename to pkgs/servers/home-assistant/custom-components/alarmo/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/auth-header/default.nix b/pkgs/servers/home-assistant/custom-components/auth-header/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/auth-header/default.nix rename to pkgs/servers/home-assistant/custom-components/auth-header/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/average/default.nix b/pkgs/servers/home-assistant/custom-components/average/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/average/default.nix rename to pkgs/servers/home-assistant/custom-components/average/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/awtrix/default.nix b/pkgs/servers/home-assistant/custom-components/awtrix/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/awtrix/default.nix rename to pkgs/servers/home-assistant/custom-components/awtrix/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/better_thermostat/default.nix b/pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/better_thermostat/default.nix rename to pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/bodymiscale/default.nix b/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/bodymiscale/default.nix rename to pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix deleted file mode 100644 index b2d958812b84..000000000000 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ callPackage -}: - -{ - adaptive_lighting = callPackage ./adaptive_lighting {}; - - alarmo = callPackage ./alarmo {}; - - auth-header = callPackage ./auth-header {}; - - awtrix = callPackage ./awtrix {}; - - average = callPackage ./average {}; - - better_thermostat = callPackage ./better_thermostat {}; - - bodymiscale = callPackage ./bodymiscale { }; - - dwd = callPackage ./dwd { }; - - elevenlabs_tts = callPackage ./elevenlabs_tts {}; - - emporia_vue = callPackage ./emporia_vue {}; - - epex_spot = callPackage ./epex_spot {}; - - frigate = callPackage ./frigate {}; - - garmin_connect = callPackage ./garmin_connect {}; - - govee-lan = callPackage ./govee-lan {}; - - gpio = callPackage ./gpio {}; - - homematicip_local = callPackage ./homematicip_local { }; - - indego = callPackage ./indego { }; - - local_luftdaten = callPackage ./local_luftdaten { }; - - localtuya = callPackage ./localtuya {}; - - mass = callPackage ./mass { }; - - midea_ac = callPackage ./midea_ac { }; - - midea_ac_lan = callPackage ./midea_ac_lan {}; - - midea-air-appliances-lan = callPackage ./midea-air-appliances-lan {}; - - miele = callPackage ./miele {}; - - moonraker = callPackage ./moonraker {}; - - nest_protect = callPackage ./nest_protect {}; - - ntfy = callPackage ./ntfy {}; - - omnik_inverter = callPackage ./omnik_inverter {}; - - prometheus_sensor = callPackage ./prometheus_sensor {}; - - samsungtv-smart = callPackage ./samsungtv-smart {}; - - sensi = callPackage ./sensi {}; - - smartir = callPackage ./smartir {}; - - smartthinq-sensors = callPackage ./smartthinq-sensors {}; - - solax_modbus = callPackage ./solax_modbus {}; - - solis-sensor = callPackage ./solis-sensor {}; - - somweb = callPackage ./somweb {}; - - spook = callPackage ./spook {}; - - tuya_local = callPackage ./tuya_local {}; - - volkswagen_we_connect_id = callPackage ./volkswagen_we_connect_id { }; - - volkswagencarnet = callPackage ./volkswagencarnet { }; - - waste_collection_schedule = callPackage ./waste_collection_schedule {}; - - xiaomi_gateway3 = callPackage ./xiaomi_gateway3 {}; - - xiaomi_miot = callPackage ./xiaomi_miot {}; - - yassi = callPackage ./yassi {}; -} diff --git a/pkgs/servers/home-assistant/custom-components/dwd/default.nix b/pkgs/servers/home-assistant/custom-components/dwd/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/dwd/default.nix rename to pkgs/servers/home-assistant/custom-components/dwd/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/default.nix b/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/elevenlabs_tts/default.nix rename to pkgs/servers/home-assistant/custom-components/elevenlabs_tts/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/emporia_vue/default.nix b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/emporia_vue/default.nix rename to pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix b/pkgs/servers/home-assistant/custom-components/epex_spot/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/epex_spot/default.nix rename to pkgs/servers/home-assistant/custom-components/epex_spot/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/frigate/default.nix b/pkgs/servers/home-assistant/custom-components/frigate/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/frigate/default.nix rename to pkgs/servers/home-assistant/custom-components/frigate/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/garmin_connect/default.nix b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/garmin_connect/default.nix rename to pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/govee-lan/default.nix b/pkgs/servers/home-assistant/custom-components/govee-lan/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/govee-lan/default.nix rename to pkgs/servers/home-assistant/custom-components/govee-lan/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/gpio/default.nix b/pkgs/servers/home-assistant/custom-components/gpio/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/gpio/default.nix rename to pkgs/servers/home-assistant/custom-components/gpio/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/default.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/homematicip_local/default.nix rename to pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/indego/default.nix b/pkgs/servers/home-assistant/custom-components/indego/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/indego/default.nix rename to pkgs/servers/home-assistant/custom-components/indego/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/local_luftdaten/default.nix b/pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/local_luftdaten/default.nix rename to pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/localtuya/default.nix b/pkgs/servers/home-assistant/custom-components/localtuya/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/localtuya/default.nix rename to pkgs/servers/home-assistant/custom-components/localtuya/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/mass/default.nix b/pkgs/servers/home-assistant/custom-components/mass/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/mass/default.nix rename to pkgs/servers/home-assistant/custom-components/mass/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/default.nix b/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/default.nix rename to pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac/default.nix b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/midea_ac/default.nix rename to pkgs/servers/home-assistant/custom-components/midea_ac/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac_lan/default.nix b/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/midea_ac_lan/default.nix rename to pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/miele/default.nix b/pkgs/servers/home-assistant/custom-components/miele/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/miele/default.nix rename to pkgs/servers/home-assistant/custom-components/miele/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/default.nix b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/moonraker/default.nix rename to pkgs/servers/home-assistant/custom-components/moonraker/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/nest_protect/default.nix b/pkgs/servers/home-assistant/custom-components/nest_protect/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/nest_protect/default.nix rename to pkgs/servers/home-assistant/custom-components/nest_protect/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/ntfy/default.nix b/pkgs/servers/home-assistant/custom-components/ntfy/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/ntfy/default.nix rename to pkgs/servers/home-assistant/custom-components/ntfy/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/omnik_inverter/default.nix b/pkgs/servers/home-assistant/custom-components/omnik_inverter/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/omnik_inverter/default.nix rename to pkgs/servers/home-assistant/custom-components/omnik_inverter/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/prometheus_sensor/default.nix b/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/prometheus_sensor/default.nix rename to pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix b/pkgs/servers/home-assistant/custom-components/samsungtv-smart/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix rename to pkgs/servers/home-assistant/custom-components/samsungtv-smart/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/sensi/default.nix b/pkgs/servers/home-assistant/custom-components/sensi/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/sensi/default.nix rename to pkgs/servers/home-assistant/custom-components/sensi/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/smartir/default.nix b/pkgs/servers/home-assistant/custom-components/smartir/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/smartir/default.nix rename to pkgs/servers/home-assistant/custom-components/smartir/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix b/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix rename to pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix rename to pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/solis-sensor/default.nix b/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/solis-sensor/default.nix rename to pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/somweb/default.nix b/pkgs/servers/home-assistant/custom-components/somweb/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/somweb/default.nix rename to pkgs/servers/home-assistant/custom-components/somweb/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/spook/default.nix b/pkgs/servers/home-assistant/custom-components/spook/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/spook/default.nix rename to pkgs/servers/home-assistant/custom-components/spook/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/tuya_local/default.nix b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/tuya_local/default.nix rename to pkgs/servers/home-assistant/custom-components/tuya_local/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/default.nix b/pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/default.nix rename to pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/volkswagencarnet/default.nix b/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/volkswagencarnet/default.nix rename to pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix rename to pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix rename to pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/default.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/xiaomi_miot/default.nix rename to pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/yassi/default.nix b/pkgs/servers/home-assistant/custom-components/yassi/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/yassi/default.nix rename to pkgs/servers/home-assistant/custom-components/yassi/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 982de17fe824..e98f6f318436 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24313,10 +24313,10 @@ with pkgs; home-assistant = callPackage ../servers/home-assistant { }; buildHomeAssistantComponent = callPackage ../servers/home-assistant/build-custom-component { }; - home-assistant-custom-components = lib.recurseIntoAttrs - (callPackage ../servers/home-assistant/custom-components { - inherit (home-assistant.python.pkgs) callPackage; - }); + home-assistant-custom-components = lib.packagesFromDirectoryRecursive { + 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 {});