Revert "nixos/home-assistant: use override before overridePythonAttrs"
This commit is contained in:
parent
62ce5aa19a
commit
3cb83409d2
1 changed files with 8 additions and 11 deletions
|
@ -50,15 +50,10 @@ let
|
|||
# List of components used in config
|
||||
extraComponents = filter useComponent availableComponents;
|
||||
|
||||
testedPackage = if (cfg.autoExtraComponents && cfg.config != null)
|
||||
package = if (cfg.autoExtraComponents && cfg.config != null)
|
||||
then (cfg.package.override { inherit extraComponents; })
|
||||
else cfg.package;
|
||||
|
||||
# overridePythonAttrs has to be applied after override
|
||||
package = testedPackage.overridePythonAttrs (oldAttrs: {
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
# If you are changing this, please update the description in applyDefaultConfig
|
||||
defaultConfig = {
|
||||
homeassistant.time_zone = config.time.timeZone;
|
||||
|
@ -188,9 +183,13 @@ in {
|
|||
};
|
||||
|
||||
package = mkOption {
|
||||
default = pkgs.home-assistant;
|
||||
default = pkgs.home-assistant.overridePythonAttrs (oldAttrs: {
|
||||
doCheck = false;
|
||||
});
|
||||
defaultText = literalExample ''
|
||||
pkgs.home-assistant
|
||||
pkgs.home-assistant.overridePythonAttrs (oldAttrs: {
|
||||
doCheck = false;
|
||||
})
|
||||
'';
|
||||
type = types.package;
|
||||
example = literalExample ''
|
||||
|
@ -199,12 +198,10 @@ in {
|
|||
}
|
||||
'';
|
||||
description = ''
|
||||
Home Assistant package to use. Tests are automatically disabled, as they take a considerable amout of time to complete.
|
||||
Home Assistant package to use. By default the tests are disabled, as they take a considerable amout of time to complete.
|
||||
Override <literal>extraPackages</literal> or <literal>extraComponents</literal> in order to add additional dependencies.
|
||||
If you specify <option>config</option> and do not set <option>autoExtraComponents</option>
|
||||
to <literal>false</literal>, overriding <literal>extraComponents</literal> will have no effect.
|
||||
Avoid <literal>home-assistant.overridePythonAttrs</literal> if you use
|
||||
<literal>autoExtraComponents</literal>.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue