summary refs log tree commit diff
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-03-01 03:36:44 +0100
committeraszlig <aszlig@redmoonstudios.org>2016-03-01 03:36:44 +0100
commit605cc4fdeb41642c3d13f860a80cf85f5c4a4036 (patch)
tree5ccc48e82e165b91df639e71bc0242ceb1d8bdff
parent3d382e7f22cc0b61306c191a4cbf120a96986c5c (diff)
parentbd3ca11e0d5f4652d4b8da094dc77094f5e05e39 (diff)
downloadnixlib-605cc4fdeb41642c3d13f860a80cf85f5c4a4036.tar
nixlib-605cc4fdeb41642c3d13f860a80cf85f5c4a4036.tar.gz
nixlib-605cc4fdeb41642c3d13f860a80cf85f5c4a4036.tar.bz2
nixlib-605cc4fdeb41642c3d13f860a80cf85f5c4a4036.tar.lz
nixlib-605cc4fdeb41642c3d13f860a80cf85f5c4a4036.tar.xz
nixlib-605cc4fdeb41642c3d13f860a80cf85f5c4a4036.tar.zst
nixlib-605cc4fdeb41642c3d13f860a80cf85f5c4a4036.zip
Merge pull request #13052 from @bendlas
Updates VirtualBox from version 5.0.12 to 5.0.14.

Upstream changes are (without bug IDs):

 * GUI: properly limit the number of VCPUs to the number of physical cores
        on Mac OS X
 * Audio: fixed a bug which prevented loading a saved state of a saved
          guests with HDA emulation (5.0.12 regression)
 * Audio: don't crash if the backend is unable to initialize
 * Audio: fixed audio capture on Mac OS X
 * Storage: fixed a possible crash when attaching the same ISO image
            multiple times to the same VM
 * BIOS: properly report if two floppy drives are attached
 * USB: fixed a problem with filters which would not capture the device
        under certain circumstances (5.0.10 regression)
 * ExtPack: black-list Extension Packs older than 4.3.30 due to
            incompatible changes not being properly handled in the past
 * Windows hosts: fixed a regression which caused robocopy to fail
 * Linux hosts: properly create the /sbin/rcvboxdrv symbolic link (5.0.12
                regression)
 * Mac OS X hosts: several fixes for USB on El Capitan
 * Linux Additions: fixes for Linux 4.5

Full upstream changelog with bug IDs can be found at:

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

The reason I was reluctant to merge this before were these symbol lookup
errors:

  vboxsf: Unknown symbol VBoxGuest_RTMemTmpFree (err 0)
  vboxsf: Unknown symbol VBoxGuestIDCCall (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTSemFastMutexRequest (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTSemFastMutexRelease (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTLogRelGetDefaultInstanceEx (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTErrConvertToErrno (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTSemFastMutexCreate (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTSemFastMutexDestroy (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTMemContFree (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTSemMutexRelease (err 0)
  vboxsf: Unknown symbol VBoxGuestIDCOpen (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTAssertShouldPanic (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTMemContAlloc (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTSemMutexRequest (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTSemMutexCreate (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTMemTmpAllocTag (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTSemMutexDestroy (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTAssertMsg1Weak (err 0)
  vboxsf: Unknown symbol VBoxGuestIDCClose (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTAssertMsg2Weak (err 0)

However, after testing it against 5.0.12, the same errors occur there as
well, so it is likely related to our VM tests.
-rw-r--r--pkgs/applications/virtualization/virtualbox/default.nix8
-rw-r--r--pkgs/applications/virtualization/virtualbox/guest-additions/default.nix2
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 855694e04120..c0fd8214b317 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -18,7 +18,7 @@ let
   # revision/hash as well. See
   # http://download.virtualbox.org/virtualbox/${version}/SHA256SUMS
   # for hashes.
-  version = "5.0.12";
+  version = "5.0.14";
 
   forEachModule = action: ''
     for mod in \
@@ -39,12 +39,12 @@ let
   '';
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
-  extpackRevision = "104815";
+  extpackRevision = "105127";
   extensionPack = requireFile rec {
     name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
     # IMPORTANT: Hash must be base16 encoded because it's used as an input to
     # VBoxExtPackHelperApp!
-    sha256 = "ac1bc8452b7fdf183325272149e9f18b9810cc07adf18e48755385a9cd1b236d";
+    sha256 = "4a404b0d09dfd3952107e314ab63262293b2fb0a4dc6837b57fb7274bd016865";
     message = ''
       In order to use the extension pack, you need to comply with the VirtualBox Personal Use
       and Evaluation License (PUEL) by downloading the related binaries from:
@@ -63,7 +63,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "de0362b1d404d1ca0298db1984acb6f0f1c6210313aeb744fea345ad9201e86e";
+    sha256 = "69abac7255b2251a18fd73c0b7c200d5f8ce72a59fa019b53a5cdbf7f2843002";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 43f591cf6aad..57d9d28a773a 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "61a19c9ec4b449cbc6bb41b636b03a16bf5a47ffa4943423d262863017e8bc9b";
+    sha256 = "cec0df18671adfe62a34d3810543f76f76206b212b2b61791fe026214c77507c";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";