forked from mirrors/nixpkgs
virtualbox: Update to new upstream version 4.2.6.
Fortunately this time the upstream package was packaged correctly and we no longer need the patch to remove the reference to the fa_IR locale. In addition we need to add lvm2 to dependencies because VirtualBox now requires libdevmapper with its default configuration. We could disable it but in order to gain DM support I think it's necessary and at least could avoid some confusion from users if it's not working "out of the box" :-) This is a bugfix release, upstream changes are: * VMM: don't inject stale VT-x events to prevent crashes after VM reset * VMM: workaround for buggy BIOSes which enable MONITOR only for certain CPUs * GUI: fixed trimming of anti-aliased text in details-view element headers * GUI: fixed create-settings-file-alias functionality on Mac hosts * GUI: fixed take-guest-screenshot functionality on Windows hosts * GUI: several minor fixes, including palette fixes * GUI: fixed Windows 2012 OS type * GUI: allow to terminate the VM even if VBoxSVC crashed * API: fixed cancelling of snapshots, previously this could lead to inconsistent VM configs * API: fixed identifying disk images by UUID * 3D Support: several fixes * VRDP: fixed occasional crash with external authentication * VGA: fix for double scan text modes * USB: fixed invalid pending request count at the time of service of DEVICE POWER requests (Windows hosts only) * USB keyboard: Korean keyboard workaround * Storage: fixed hang with QCOW images and asynchronous I/O enabled * Storage: fixed hang with newer VHD images * Storage: actually write the non-rotational flag to the VM settings (4.2.0 regression) * Virtio-net: fixed the problem with network statistics counters in Session Information dialog (GUI) * Metrics: introduced network rate and disk usage metrics * Metrics: fixed a crash under certain conditions on Solaris hosts * BIOS: fix for El Torito * Shared Folders: if the host folder of a shared folder mapping does not exist, keep it active but mark it as invalid to prevent inconsistent saved states * VBoxManage: fixed converting disks from raw images * VBoxManage: show snapshot description in the VM or snapshot information * VBoxManage: make implicit opening of media consistent in all places dealing with media * VBoxManage: the iSCSI initiator name was not stored in the settings file when doing storageattach * VBoxManage: metrics collect now properly handles 'CPU/MHz' and 'Net/*/LinkSpeed' metrics * VBoxManage: changing the image UUID or parent UUID as part of storageattach works now in all safe cases * VBoxManage: introduced storageattach --medium additions as a shortcut to mount the additions image * OVF: fixed importing OVF files cerated by recent VMware products * Linux hosts / Bridged Networking: fixed the problem with leaking connections in conntrack * Linux Additions: added support for ConsoleKit sessions in the vminfo service of VBoxService * Linux Additions: don't crash during remount under certain conditions * Linux/Solaris Additions: fixed guest memory metrics collection * Solaris hosts: added a dependency to ensure that the user directories are reachable when starting VBox services * Windows host installer: integrated user-contributed translations, thanks to all contributors! * Windows Additions: fixed auto-logon installation for Windows 8 * Windows Additions: don't fail if the shared folders host service is not available * Windows Additions: fixed Guest Additions startup on Windows 2000 guests * Windows Additions: auto-resize fixes for Windows 8 guests Upstream changelist with bug ids can be found here: https://www.virtualbox.org/wiki/Changelog Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
parent
fdf11fdb7e
commit
acb6290eed
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
|
||||
, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel
|
||||
, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2
|
||||
, which, alsaLib, curl, gawk
|
||||
, xorriso, makeself, perl, pkgconfig
|
||||
, javaBindings ? false, jdk ? null
|
||||
|
@ -11,8 +11,8 @@ with stdenv.lib;
|
|||
|
||||
let
|
||||
|
||||
version = "4.2.4";
|
||||
extpackRevision = "81684";
|
||||
version = "4.2.6";
|
||||
extpackRevision = "82870";
|
||||
|
||||
forEachModule = action: ''
|
||||
for mod in \
|
||||
|
@ -35,7 +35,7 @@ let
|
|||
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}"
|
||||
+ ".vbox-extpack";
|
||||
# Has to be base16 because it's used as an input to VBoxExtPackHelperApp!
|
||||
sha256 = "62078e057a4ab56aec5ac086746522b3d94787333d0444169471fa5152c609ed";
|
||||
sha256 = "f0113688a76efa0426c27c5541c78506b18637025c35aa682ecc6eeed5d56582";
|
||||
url = "https://www.virtualbox.org/wiki/Downloads";
|
||||
};
|
||||
|
||||
|
@ -44,19 +44,17 @@ in stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
|
||||
sha256 = "a7c607523c1c10b7b978ab39a92bb646517316548aa4a1a74b6e434ac2bf0adc";
|
||||
sha256 = "54526091bc2aa66b88ca878dd9ecc4466f96d607db2f6678a9d673ecf6646ae3";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL
|
||||
libcap glib kernel python alsaLib curl pam xorriso makeself perl
|
||||
libcap glib kernel lvm2 python alsaLib curl pam xorriso makeself perl
|
||||
pkgconfig which libXmu ]
|
||||
++ optional javaBindings jdk
|
||||
++ optional pythonBindings python;
|
||||
|
||||
patches = [ ./remove_fa_ir.patch ];
|
||||
|
||||
postPatch = ''
|
||||
prePatch = ''
|
||||
set -x
|
||||
MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
|
||||
sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \
|
||||
|
|
|
@ -1,30 +0,0 @@
|
|||
This patch is for VirtualBox-4.2.2, to temporarily remove references to the
|
||||
fa_IR language file from the source tree, as it somehow got lost during tarball
|
||||
creation. For more information on this subject please have a look at:
|
||||
|
||||
https://www.virtualbox.org/pipermail/vbox-dev/2012-October/005408.html
|
||||
|
||||
diff --git a/src/VBox/Frontends/VirtualBox/VBoxUI.pro b/src/VBox/Frontends/VirtualBox/VBoxUI.pro
|
||||
index ffeb410..37ac56a 100644
|
||||
--- a/src/VBox/Frontends/VirtualBox/VBoxUI.pro
|
||||
+++ b/src/VBox/Frontends/VirtualBox/VBoxUI.pro
|
||||
@@ -63,7 +63,6 @@ TRANSLATIONS = \
|
||||
nls/VirtualBox_es.ts \
|
||||
nls/VirtualBox_eu.ts \
|
||||
nls/VirtualBox_fi.ts \
|
||||
- nls/VirtualBox_fa_IR.ts \
|
||||
nls/VirtualBox_fr.ts \
|
||||
nls/VirtualBox_gl_ES.ts \
|
||||
nls/VirtualBox_hu.ts \
|
||||
diff --git a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
|
||||
index 66f0ec3..2fc19b9 100644
|
||||
--- a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
|
||||
+++ b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
|
||||
@@ -23,7 +23,6 @@ VBOX_APPROVED_GUI_LANGUAGES := \
|
||||
de \
|
||||
en \
|
||||
es \
|
||||
- fa_IR \
|
||||
hu \
|
||||
it \
|
||||
ja \
|
Loading…
Reference in a new issue