nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 00:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #327380 from NixOS/backport-321010-to-release-24.05

Browse Source 
[Backport release-24.05] virtualboxKvm: 20240515 -> 20240617
This commit is contained in:
Masum Reza 2024-08-21 15:07:44 +05:30 committed by GitHub
commit b538a69ce8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/modules/virtualisation/virtualbox-host.nix
View File

@ -89,7 +89,7 @@ in
Enable KVM support for VirtualBox. This increases compatibility with Linux kernel versions, because the VirtualBox kernel modules
are not required.
This option is incompatible with `enableHardening` and `addNetworkInterface`.
This option is incompatible with `addNetworkInterface`.
Note: This is experimental. Please check https://github.com/cyberus-technology/virtualbox-kvm/issues.
'';
@ -136,18 +136,6 @@ in
assertion = !cfg.addNetworkInterface;
message = "VirtualBox KVM only supports standard NAT networking for VMs. Please turn off virtualisation.virtualbox.host.addNetworkInterface.";
}
{
assertion = !cfg.enableHardening;
message = "VirtualBox KVM is not compatible with hardening: Please turn off virtualisation.virtualbox.host.enableHardening.";
}
];
warnings = [
''
KVM support in VirtualBox is experimental. Not all security features are available yet.
See: https://github.com/cyberus-technology/virtualbox-kvm/issues/12
''
];
}) (mkIf (!cfg.enableKvm) {
boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ];

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

@ -22,9 +22,6 @@
, extraConfigureFlags ? ""
}:
# See https://github.com/cyberus-technology/virtualbox-kvm/issues/12
assert enableKvm -> !enableHardening;
# The web services use Java infrastructure.
assert enableWebService -> javaBindings;
@ -35,8 +32,8 @@ let
virtualboxVersion = "7.0.18";
virtualboxSha256 = "d999513533631674a024762668de999411d8197060c51e68c5faf0a2c0eea1a5";
kvmPatchVersion = "20240515";
kvmPatchHash = "sha256-Kh/tlPScdf7CbEEpL54iqMpeUIdmnJL2r/mxnlEzLd0=";
kvmPatchVersion = "20240617";
kvmPatchHash = "sha256-bOcM9xA1SXB1uTwljpw2vevVeSdHa3omCRon/8DoAUk=";
# The KVM build is not compatible to VirtualBox's kernel modules. So don't export
# modsrc at all.