From 92e559212a7d15b458f0229648f5685618db4ec8 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 1 May 2018 22:45:31 +0200 Subject: [PATCH 1/3] virtualisation.virtualbox.host: introduce enableExtensionPack --- nixos/modules/virtualisation/virtualbox-host.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index 7413e12c8f3..afb7b5fc031 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -6,7 +6,7 @@ let cfg = config.virtualisation.virtualbox.host; virtualbox = pkgs.virtualbox.override { - inherit (cfg) enableHardening headless; + inherit (cfg) enableExtensionPack enableHardening headless; }; kernelModules = config.boot.kernelPackages.virtualbox.override { @@ -30,6 +30,8 @@ in ''; }; + enableExtensionPack = mkEnableOption "VirtualBox extension pack"; + addNetworkInterface = mkOption { type = types.bool; default = true; From d3527d947fa767e9d7eb54bc26be042992a46f13 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 1 May 2018 22:46:28 +0200 Subject: [PATCH 2/3] virtualisation.virtualbox.host: migrate from mkOption to mkEnableOption --- nixos/modules/virtualisation/virtualbox-host.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index afb7b5fc031..885d752577d 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -17,9 +17,7 @@ in { options.virtualisation.virtualbox.host = { - enable = mkOption { - type = types.bool; - default = false; + enable = mkEnableOption "VirtualBox" // { description = '' Whether to enable VirtualBox. From 8eb3167e2efdaa6db6cf6ff0d07bc872591dd37c Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 1 May 2018 22:46:59 +0200 Subject: [PATCH 3/3] virtualbox: 5.2.8 -> 5.2.10 closes #39182. --- pkgs/applications/virtualization/virtualbox/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 29cb7c192b5..ca0520f32a8 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -21,10 +21,10 @@ let buildType = "release"; # Manually sha256sum the extensionPack file, must be hex! # Do not forget to update the hash in ./guest-additions/default.nix! - extpack = "355ea5fe047f751534720c65398b44290d53f389e0f5f66818f3f36746631d26"; - extpackRev = "121009"; - main = "ee2759d47b0b4ac81b8b671c9485c87fb2db12c097b3e7e69b94c1291a8084e8"; - version = "5.2.8"; + extpack = "5eef217dbe0a8e8caf383ea8db83344517af0f9093041b5345c8468a427b327b"; + extpackRev = "122406"; + main = "1k14ngz1gcz02qwbpzfp4kgxv8s24js8pwd5nyyqs6jpxx6557pd"; + version = "5.2.10"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec {