Unverified Commit 2eb92f40 authored by r-vdp's avatar r-vdp
Browse files

fixup! nixos/tools: set the enable options with mkDefault

parent ba3e5b02

nixos/modules/installer/tools/tools.nix

+10 −23
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ in 
  imports = let

    mkToolModule = { name, package ? pkgs.${name} }: { config, ... }: {

      options.system.tools.${name}.enable = lib.mkEnableOption "${name} script" // {

        default = config.nix.enable;

        default = config.nix.enable && ! config.system.disableInstallerTools;

        internal = true;

      };
@@ -235,19 +235,7 @@ in 
    (mkToolModule { name = "nixos-version"; package = nixos-version; })

  ];



  config = lib.mkMerge [

    (lib.mkIf config.system.disableInstallerTools {

      system.tools = {

        nixos-build-vms.enable = lib.mkDefault false;

        nixos-enter.enable = lib.mkDefault false;

        nixos-generate-config.enable = lib.mkDefault false;

        nixos-install.enable = lib.mkDefault false;

        nixos-option.enable = lib.mkDefault false;

        nixos-rebuild.enable = lib.mkDefault false;

        nixos-version.enable = lib.mkDefault false;

      };

    })

    {

  config = {

    documentation.man.man-db.skipPackages = [ nixos-version ];



    # These may be used in auxiliary scripts (ie not part of toplevel), so they are defined unconditionally.
@@ -256,6 +244,5 @@ in 
      nixos-option = lib.warn "Accessing nixos-option through `config.system.build` is deprecated, use `pkgs.nixos-option` instead." pkgs.nixos-option;

      nixos-enter = lib.warn "Accessing nixos-enter through `config.system.build` is deprecated, use `pkgs.nixos-enter` instead." pkgs.nixos-enter;

    };

    }

  ];

  };

}