Merge pull request #119191 from NixOS/revert-118719-home-assistant-tests

This commit is contained in:
Martin Weinelt 2021-04-17 02:35:05 +02:00 committed by GitHub
commit e5cc06a1e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -50,15 +50,10 @@ let
# List of components used in config # List of components used in config
extraComponents = filter useComponent availableComponents; extraComponents = filter useComponent availableComponents;
testedPackage = if (cfg.autoExtraComponents && cfg.config != null) package = if (cfg.autoExtraComponents && cfg.config != null)
then (cfg.package.override { inherit extraComponents; }) then (cfg.package.override { inherit extraComponents; })
else cfg.package; 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 # If you are changing this, please update the description in applyDefaultConfig
defaultConfig = { defaultConfig = {
homeassistant.time_zone = config.time.timeZone; homeassistant.time_zone = config.time.timeZone;
@ -188,9 +183,13 @@ in {
}; };
package = mkOption { package = mkOption {
default = pkgs.home-assistant; default = pkgs.home-assistant.overrideAttrs (oldAttrs: {
doInstallCheck = false;
});
defaultText = literalExample '' defaultText = literalExample ''
pkgs.home-assistant pkgs.home-assistant.overrideAttrs (oldAttrs: {
doInstallCheck = false;
})
''; '';
type = types.package; type = types.package;
example = literalExample '' example = literalExample ''
@ -199,12 +198,11 @@ in {
} }
''; '';
description = '' 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. 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> 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. to <literal>false</literal>, overriding <literal>extraComponents</literal> will have no effect.
Avoid <literal>home-assistant.overridePythonAttrs</literal> if you use Avoid <literal>home-assistant.overridePythonAttrs</literal> if you use <literal>autoExtraComponents</literal>.
<literal>autoExtraComponents</literal>.
''; '';
}; };