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

authored by

Martin Weinelt and committed by
GitHub
e5cc06a1 3041a858

+9 -11
+9 -11
nixos/modules/services/misc/home-assistant.nix
··· 50 50 # List of components used in config 51 51 extraComponents = filter useComponent availableComponents; 52 52 53 - testedPackage = if (cfg.autoExtraComponents && cfg.config != null) 53 + package = if (cfg.autoExtraComponents && cfg.config != null) 54 54 then (cfg.package.override { inherit extraComponents; }) 55 55 else cfg.package; 56 - 57 - # overridePythonAttrs has to be applied after override 58 - package = testedPackage.overridePythonAttrs (oldAttrs: { 59 - doCheck = false; 60 - }); 61 56 62 57 # If you are changing this, please update the description in applyDefaultConfig 63 58 defaultConfig = { ··· 188 183 }; 189 184 190 185 package = mkOption { 191 - default = pkgs.home-assistant; 186 + default = pkgs.home-assistant.overrideAttrs (oldAttrs: { 187 + doInstallCheck = false; 188 + }); 192 189 defaultText = literalExample '' 193 - pkgs.home-assistant 190 + pkgs.home-assistant.overrideAttrs (oldAttrs: { 191 + doInstallCheck = false; 192 + }) 194 193 ''; 195 194 type = types.package; 196 195 example = literalExample '' ··· 199 198 } 200 199 ''; 201 200 description = '' 202 - Home Assistant package to use. Tests are automatically disabled, as they take a considerable amout of time to complete. 201 + Home Assistant package to use. By default the tests are disabled, as they take a considerable amout of time to complete. 203 202 Override <literal>extraPackages</literal> or <literal>extraComponents</literal> in order to add additional dependencies. 204 203 If you specify <option>config</option> and do not set <option>autoExtraComponents</option> 205 204 to <literal>false</literal>, overriding <literal>extraComponents</literal> will have no effect. 206 - Avoid <literal>home-assistant.overridePythonAttrs</literal> if you use 207 - <literal>autoExtraComponents</literal>. 205 + Avoid <literal>home-assistant.overridePythonAttrs</literal> if you use <literal>autoExtraComponents</literal>. 208 206 ''; 209 207 }; 210 208