nixos/vbox: Move all options to virtualisation.*.

Commit 687caeb renamed services.virtualboxHost to programs.virtualbox,
but according to the discussion on the commit, it's probably a better to
put it into virtualisation.virtualbox instead.

The discussion can be found here:

https://github.com/NixOS/nixpkgs/commit/687caeb#commitcomment-12664978

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig
2015-08-13 12:17:32 +02:00
parent f741d426da
commit 6440e9bbfd
5 changed files with 28 additions and 21 deletions

View File

@@ -6,7 +6,7 @@ with lib;
let
cfg = config.services.virtualboxGuest;
cfg = config.virtualisation.virtualbox.guest;
kernel = config.boot.kernelPackages;
in
@@ -15,20 +15,11 @@ in
###### interface
options = {
services.virtualboxGuest = {
enable = mkOption {
default = false;
description = "Whether to enable the VirtualBox service and other guest additions.";
};
};
options.virtualisation.virtualbox.guest.enable = mkOption {
default = false;
description = "Whether to enable the VirtualBox service and other guest additions.";
};
###### implementation
config = mkIf cfg.enable {

View File

@@ -3,7 +3,7 @@
with lib;
let
cfg = config.programs.virtualbox;
cfg = config.virtualisation.virtualbox.host;
virtualbox = config.boot.kernelPackages.virtualbox.override {
inherit (cfg) enableHardening;
};
@@ -11,7 +11,7 @@ let
in
{
options.programs.virtualbox = {
options.virtualisation.virtualbox.host = {
enable = mkOption {
type = types.bool;
default = false;