ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 20:49:52 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #39836 from flokli/virtualbox-5.2.10

Browse Source 
virtualbox: 5.2.8 -> 5.2.10
This commit is contained in:
Matthew Justin Bauer 2018-05-01 16:32:48 -05:00 committed by GitHub
commit c46c5b8f4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/virtualisation/virtualbox-host.nix
View File

@ -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;

8
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -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 {