diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-05-01 16:32:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-01 16:32:48 -0500 |
| commit | c46c5b8f4e0dab6917c71ca177ecbb77cdc676c1 (patch) | |
| tree | 5a6bb69562ae16b0d09d0126235f644030a93aa9 | |
| parent | af7da1c8a3341ab1ab51ac15b71abf47bf33b5dc (diff) | |
| parent | 8eb3167e2efdaa6db6cf6ff0d07bc872591dd37c (diff) | |
| download | nixlib-c46c5b8f4e0dab6917c71ca177ecbb77cdc676c1.tar nixlib-c46c5b8f4e0dab6917c71ca177ecbb77cdc676c1.tar.gz nixlib-c46c5b8f4e0dab6917c71ca177ecbb77cdc676c1.tar.bz2 nixlib-c46c5b8f4e0dab6917c71ca177ecbb77cdc676c1.tar.lz nixlib-c46c5b8f4e0dab6917c71ca177ecbb77cdc676c1.tar.xz nixlib-c46c5b8f4e0dab6917c71ca177ecbb77cdc676c1.tar.zst nixlib-c46c5b8f4e0dab6917c71ca177ecbb77cdc676c1.zip | |
Merge pull request #39836 from flokli/virtualbox-5.2.10
virtualbox: 5.2.8 -> 5.2.10
| -rw-r--r-- | nixos/modules/virtualisation/virtualbox-host.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/default.nix | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index 7413e12c8f3d..885d752577d5 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 { @@ -17,9 +17,7 @@ in { options.virtualisation.virtualbox.host = { - enable = mkOption { - type = types.bool; - default = false; + enable = mkEnableOption "VirtualBox" // { description = '' Whether to enable VirtualBox. @@ -30,6 +28,8 @@ in ''; }; + enableExtensionPack = mkEnableOption "VirtualBox extension pack"; + addNetworkInterface = mkOption { type = types.bool; default = true; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 29cb7c192b56..ca0520f32a8f 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 { |