From f96aafd4035595144375c92c23159b67f7c40446 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Wed, 31 Jan 2018 22:56:09 +0100
Subject: virtualbox: 5.2.4 -> 5.2.6

Upstream changes without issue IDs:

 * GUI: fixed occasional screen corruption when host screen resolution
        is changed
 * User interface: increase proposed disk size when creating new VMs for
                   Windows 7 and newer
 * User interface: various improvements for high resolution screens
 * VMM: Fixed problems using 256MB VRAM in raw-mode VMs
 * Audio: implemented support for audio playback and recording for macOS
          guests
 * Audio: further timing improvements for Windows 10 guests
 * Linux hosts: fixed problem accessing mini-toolbar under XFCE

The full changelog including issue IDs can be found at:

https://www.virtualbox.org/wiki/Changelog#v6

What was not mentioned in the changelog is that this release fixes
compiling the VirtualBox modules against kernel 4.15, which was added in
commit 61043ad4d1425af2d2b5cb3af8b3740fdd90e3ad.

Tested this by running all of the tests in nixos/tests/virtualbox.nix.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @flokli, @svanderburg
---
 pkgs/applications/virtualization/virtualbox/default.nix           | 8 ++++----
 .../virtualization/virtualbox/guest-additions/default.nix         | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 3e9322ddeafb..38509d299d95 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 = "98e9df4f23212c3de827af9d770b391cf2dba8d21f4de597145512c1479302cd";
-  extpackRev = "119785";
-  main = "053xpf0kxrig4jq5djfz9drhkxy1x5a4p9qvgxc0b3hnk6yn1869";
-  version = "5.2.4";
+  extpack = "70584a70b666e9332ae2c6be0e64da4b8e3a27124801156577f205750bdde4f5";
+  extpackRev = "120293";
+  main = "1rx45ivwk89ghjc5zdd7c7j92w0w3930xj7l1zhwrvshxs454w7y";
+  version = "5.2.6";
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
   extensionPack = requireFile rec {
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 8f789cdf1707..f82eec07a29d 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 = "0qhsr6vc48ld2p9q3a6n6rfg57rsn163axr3r1m2yqr2snr4pnk0";
+    sha256 = "1px9jp6lv7ff7kn4ns5r4dq7xl4wiz3h4ckgdhgvxs040njpdzy5";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
-- 
cgit 1.4.1