git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #54917 from peterhoeg/f/vmware

vmware: move from services to virtualisation and add support for paravirtual controller

commitecb3c507f5e9f6c0c19a9e1ecb2b3a25d39b08a7 authorPeter Hoeg <peter@hoeg.com> dateWed 20 Feb 2019, 14:34 (8 years ago) parent55757a0d5d3184
2 files changed+10−9
nixos/modules/rename.nix+1 nixos/modules/virtualisation/vmware-guest.nix+9−9
nixos/modules/rename.nix+1
@@ -59,6 +59,7 @@ with lib;
5959 (mkRenamedOptionModule [ "services" "statsd" "host" ] [ "services" "statsd" "listenAddress" ])
6060 (mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ])
6161 (mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ])
62+ (mkRenamedOptionModule [ "services" "vmwareGuest" ] [ "virtualisation" "vmware" "guest" ])
6263 (mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ])
6364
6465 (mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ])
nixos/modules/virtualisation/vmware-guest.nix+9−9
@@ -3,19 +3,17 @@
33with lib;
44
55let
6− cfg = config.services.vmwareGuest;
6+ cfg = config.virtualisation.vmware.guest;
77 open-vm-tools = if cfg.headless then pkgs.open-vm-tools-headless else pkgs.open-vm-tools;
88 xf86inputvmmouse = pkgs.xorg.xf86inputvmmouse;
99in
1010{
11− options = {
12− services.vmwareGuest = {
13− enable = mkEnableOption "VMWare Guest Support";
14− headless = mkOption {
15− type = types.bool;
16− default = false;
17− description = "Whether to disable X11-related features.";
18− };
11+ options.virtualisation.vmware.guest = {
12+ enable = mkEnableOption "VMWare Guest Support";
13+ headless = mkOption {
14+ type = types.bool;
15+ default = false;
16+ description = "Whether to disable X11-related features.";
1917 };
2018 };
2119
@@ -25,6 +23,8 @@ in
2523 message = "VMWare guest is not currently supported on ${pkgs.stdenv.hostPlatform.system}";
2624 } ];
2725
26+ boot.initrd.kernelModules = [ "vmw_pvscsi" ];
27+
2828 environment.systemPackages = [ open-vm-tools ];
2929
3030 systemd.services.vmware =