public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #66405 from NeQuissimus/virtualbox_6_0_10

Browse Source 
virtualbox: 6.0.8 -> 6.0.10
This commit is contained in:
Florian Klink 2019-09-06 20:33:35 -07:00 committed by GitHub
commit db1f05c763
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nixos/tests/virtualbox.nix
View File

@ -10,17 +10,10 @@
# to run 32-bit guests. # to run 32-bit guests.
useKvmNestedVirt ? false, useKvmNestedVirt ? false,
# Whether to run 64-bit guests instead of 32-bit. Requires nested KVM. # Whether to run 64-bit guests instead of 32-bit. Requires nested KVM.
use64bitGuest ? false, use64bitGuest ? false
# Whether to enable the virtual UART in VirtualBox guests, allowing to see
# the guest console. There is currently a bug in VirtualBox where this will
# cause a crash if running with SW virtualization
# (https://www.virtualbox.org/ticket/18632). If you need to debug the tests
# then enable this and nested KVM to work around the crash (see above).
enableVBoxUART ? false
}: }:
assert use64bitGuest -> useKvmNestedVirt; assert use64bitGuest -> useKvmNestedVirt;
assert enableVBoxUART -> useKvmNestedVirt; # VirtualBox bug, see above
with import ../lib/testing.nix { inherit system pkgs; }; with import ../lib/testing.nix { inherit system pkgs; };
with pkgs.lib; with pkgs.lib;
@ -65,9 +58,6 @@ let
"init=${pkgs.writeScript "mini-init.sh" miniInit}" "init=${pkgs.writeScript "mini-init.sh" miniInit}"
]; ];
# XXX: Remove this once TSS location detection has been fixed in VirtualBox
boot.kernelPackages = pkgs.linuxPackages_4_9;
fileSystems."/" = { fileSystems."/" = {
device = "vboxshare"; device = "vboxshare";
fsType = "vboxsf"; fsType = "vboxsf";
@ -162,11 +152,9 @@ let
"--register" "--register"
]; ];
vmFlags = mkFlags ( vmFlags = mkFlags ([
(optionals enableVBoxUART [
"--uart1 0x3F8 4" "--uart1 0x3F8 4"
"--uartmode1 client /run/virtualbox-log-${name}.sock" "--uartmode1 client /run/virtualbox-log-${name}.sock"
]) ++ [
"--memory 768" "--memory 768"
"--audio none" "--audio none"
] ++ (attrs.vmFlags or [])); ] ++ (attrs.vmFlags or []));
@ -199,7 +187,7 @@ let
]; ];
in { in {
machine = { machine = {
systemd.sockets."vboxtestlog-${name}" = mkIf enableVBoxUART { systemd.sockets."vboxtestlog-${name}" = {
description = "VirtualBox Test Machine Log Socket For ${name}"; description = "VirtualBox Test Machine Log Socket For ${name}";
wantedBy = [ "sockets.target" ]; wantedBy = [ "sockets.target" ];
before = [ "multi-user.target" ]; before = [ "multi-user.target" ];
@ -207,7 +195,7 @@ let
socketConfig.Accept = true; socketConfig.Accept = true;
}; };
systemd.services."vboxtestlog-${name}@" = mkIf enableVBoxUART { systemd.services."vboxtestlog-${name}@" = {
description = "VirtualBox Test Machine Log For ${name}"; description = "VirtualBox Test Machine Log For ${name}";
serviceConfig.StandardInput = "socket"; serviceConfig.StandardInput = "socket";
serviceConfig.StandardOutput = "syslog"; serviceConfig.StandardOutput = "syslog";

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

@ -21,8 +21,8 @@ let
buildType = "release"; buildType = "release";
# Remember to change the extpackRev and version in extpack.nix and # Remember to change the extpackRev and version in extpack.nix and
# guest-additions/default.nix as well. # guest-additions/default.nix as well.
main = "11sxx2zaablkvjiw0i5g5i5ibak6bsq6fldrcxwbcby6318shnhv"; main = "1y6j73axjns8ng3m8zs31zwx71wmm91n6vrhdpxphx16jf518djj";
version = "6.0.8"; version = "6.0.10";
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "virtualbox"; pname = "virtualbox";
inherit version; inherit version;

5
pkgs/applications/virtualization/virtualbox/extpack.nix
View File

@ -2,7 +2,7 @@
with lib; with lib;
let version = "6.0.8"; let version = "6.0.10";
in in
fetchurl rec { fetchurl rec {
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack"; name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack";
@ -10,7 +10,8 @@ fetchurl rec {
sha256 = sha256 =
# Manually sha256sum the extensionPack file, must be hex! # Manually sha256sum the extensionPack file, must be hex!
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
let value = "6d89127c7f043fa96592da96ca87ac5ee9a7afd347d788380f91b695b67d7954"; # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
let value = "e5a9eb240379a57c9bf03954a594a03431698e67aef551e27f62170bed9b16ea";
in assert (builtins.stringLength value) == 64; value; in assert (builtins.stringLength value) == 64; value;
meta = { meta = {

2
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
sha256 = "1njgxb18r8a1m8fk2b32mmnbwciip3wcxwyhza5k73bx4q2sifac"; sha256 = "098kibz8dkiqd8shm44n4h6iyszcbj0ikav1b4vsi75dqzw8d9n8";
}; };
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";