diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 5c6510e8cab..a8c2dda8ea8 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -21,8 +21,8 @@ let buildType = "release"; # Remember to change the extpackRev and version in extpack.nix and # guest-additions/default.nix as well. - main = "0lp584a350ya1zn03lhgmdbi91yp8yfja9hlg2jz1xyfj2dc869l"; - version = "6.0.6"; + main = "11sxx2zaablkvjiw0i5g5i5ibak6bsq6fldrcxwbcby6318shnhv"; + version = "6.0.8"; in stdenv.mkDerivation { name = "virtualbox-${version}"; @@ -76,12 +76,6 @@ in stdenv.mkDerivation { optional enableHardening ./hardened.patch ++ [ ./qtx11extras.patch - # https://www.virtualbox.org/ticket/18620 - ./fix_kbuild.patch - # https://www.virtualbox.org/ticket/18621 - ./fix_module_makefile_sed.patch - # https://forums.virtualbox.org/viewtopic.php?f=7&t=92815 - ./fix_printk_test.patch ]; postPatch = '' diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index d26909ad79a..a748a0adbba 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -2,7 +2,7 @@ with lib; -let version = "6.0.6"; +let version = "6.0.8"; in fetchurl rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack"; @@ -10,7 +10,7 @@ fetchurl rec { sha256 = # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. - let value = "794f023a186bd217c29c3d30bd1434b6e9de3b242c7bf740d06d10f2d3d981c6"; + let value = "6d89127c7f043fa96592da96ca87ac5ee9a7afd347d788380f91b695b67d7954"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/fix_kbuild.patch b/pkgs/applications/virtualization/virtualbox/fix_kbuild.patch deleted file mode 100644 index 7cafeada7d9..00000000000 --- a/pkgs/applications/virtualization/virtualbox/fix_kbuild.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile ---- a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile -+++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile -@@ -58,7 +58,7 @@ - RT_WITH_VBOX \ - VBOX_WITH_HARDENING \ - VBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk! --VBOXMOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement -+VBOXMOD_CFLAGS = -include $(VBOXNETADPT_DIR)include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement - - include $(obj)/Makefile-footer.gmk - diff --git a/pkgs/applications/virtualization/virtualbox/fix_module_makefile_sed.patch b/pkgs/applications/virtualization/virtualbox/fix_module_makefile_sed.patch deleted file mode 100644 index 6bfa5a4404b..00000000000 --- a/pkgs/applications/virtualization/virtualbox/fix_module_makefile_sed.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -urN VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk ---- VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk 2019-04-16 12:16:38.000000000 +0200 -+++ VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk 2019-05-04 15:19:14.545497602 +0200 -@@ -175,7 +175,7 @@ - | $$(dir $$@) - $(QUIET)$(RM) -f -- $@ - ifndef VBOX_WITH_HARDENING -- $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $< -+ $(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output $@ $< - else - $(QUIET)$(CP) -f $< $@ - endif -diff -urN VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk ---- VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk 2019-04-16 12:16:39.000000000 +0200 -+++ VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk 2019-05-04 15:19:13.809493324 +0200 -@@ -525,7 +525,7 @@ - | $$(dir $$@) - $(QUIET)$(RM) -f -- $@ - ifndef VBOX_WITH_HARDENING -- $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $< -+ $(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output $@ $< - else - $(QUIET)$(CP) -f $< $@ - endif -diff -urN VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxPci/Makefile.kmk VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxPci/Makefile.kmk ---- VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxPci/Makefile.kmk 2019-04-16 12:16:40.000000000 +0200 -+++ VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxPci/Makefile.kmk 2019-05-04 15:42:12.029664987 +0200 -@@ -67,7 +67,7 @@ - | $$(dir $$@) - $(QUIET)$(RM) -f -- $@ - ifndef VBOX_WITH_HARDENING -- $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $< -+ $(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output $@ $< - else - $(QUIET)$(CP) -f $< $@ - endif diff --git a/pkgs/applications/virtualization/virtualbox/fix_printk_test.patch b/pkgs/applications/virtualization/virtualbox/fix_printk_test.patch deleted file mode 100644 index eceaff2dc61..00000000000 --- a/pkgs/applications/virtualization/virtualbox/fix_printk_test.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN VirtualBox-6.0.6/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c VirtualBox-6.0.6.new/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c ---- VirtualBox-6.0.6/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c 2019-04-16 12:16:37.000000000 +0200 -+++ VirtualBox-6.0.6.new/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c 2019-05-04 15:59:44.439905223 +0200 -@@ -426,10 +426,8 @@ - int rc; - PSUPDRVSESSION pSession; - Log(("VBoxDrvLinuxCreate: pFilp=%p pid=%d/%d %s\n", pFilp, RTProcSelf(), current->pid, current->comm)); -- printk("test1\n"); - - #ifdef VBOX_WITH_HARDENING -- printk("test2\n"); - /* - * Only root is allowed to access the unrestricted device, enforce it! - */ diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 1a5c6c670c8..e0f4f61332c 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "1srcsf9264l5yxbq2x83z66j38blbfrywq5lkzwb5kih6sv548c3"; + sha256 = "1njgxb18r8a1m8fk2b32mmnbwciip3wcxwyhza5k73bx4q2sifac"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/os-specific/linux/virtualbox/default.nix b/pkgs/os-specific/linux/virtualbox/default.nix index f2fd4d4a61a..f795d36207a 100644 --- a/pkgs/os-specific/linux/virtualbox/default.nix +++ b/pkgs/os-specific/linux/virtualbox/default.nix @@ -11,13 +11,8 @@ stdenv.mkDerivation { KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - makeFlags = [ - "-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - "INSTALL_MOD_PATH=$(out)" - ]; - preBuild = "makeFlagsArray+=(\"M=$(pwd)\")"; - buildFlags = [ "modules" ]; - installTargets = [ "modules_install" ]; + makeFlags = [ "INSTALL_MOD_PATH=$(out)" ]; + installTargets = [ "install" ]; enableParallelBuilding = true;