git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #119191 from NixOS/revert-118719-home-assistant-tests
commite5cc06a1e806070693add4f231060a62b962fc44 authorMartin Weinelt <mweinelt@users.noreply.github.com> dateSat 17 Apr 2021, 02:35 (6 years ago) parent3041a851d9f619
1 file changed+9−11
nixos/modules/services/misc/home-assistant.nix+9−11
nixos/modules/services/misc/home-assistant.nix+9−11
@@ -50,15 +50,10 @@ let
5050 # List of components used in config
5151 extraComponents = filter useComponent availableComponents;
5252
53− testedPackage = if (cfg.autoExtraComponents && cfg.config != null)
53+ package = if (cfg.autoExtraComponents && cfg.config != null)
5454 then (cfg.package.override { inherit extraComponents; })
5555 else cfg.package;
5656
57− # overridePythonAttrs has to be applied after override
58− package = testedPackage.overridePythonAttrs (oldAttrs: {
59− doCheck = false;
60− });
61−
6257 # If you are changing this, please update the description in applyDefaultConfig
6358 defaultConfig = {
6459 homeassistant.time_zone = config.time.timeZone;
@@ -188,9 +183,13 @@ in {
188183 };
189184
190185 package = mkOption {
191− default = pkgs.home-assistant;
186+ default = pkgs.home-assistant.overrideAttrs (oldAttrs: {
187+ doInstallCheck = false;
188+ });
192189 defaultText = literalExample ''
193− pkgs.home-assistant
190+ pkgs.home-assistant.overrideAttrs (oldAttrs: {
191+ doInstallCheck = false;
192+ })
194193 '';
195194 type = types.package;
196195 example = literalExample ''
@@ -199,12 +198,11 @@ in {
199198 }
200199 '';
201200 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.
203202 Override <literal>extraPackages</literal> or <literal>extraComponents</literal> in order to add additional dependencies.
204203 If you specify <option>config</option> and do not set <option>autoExtraComponents</option>
205204 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>.
208206 '';
209207 };
210208