diff options
| author | Masum Reza <50095635+JohnRTitor@users.noreply.github.com> | 2024-08-21 15:07:44 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-21 15:07:44 +0530 |
| commit | b538a69ce866ca7c519c513459d0b0c2cb472975 (patch) | |
| tree | c38115bce65a8a4e1e916bec00f8b94ba90d9609 | |
| parent | Merge pull request #336217 from tpwrules/pr/24.05/micropython-fixup (diff) | |
| parent | nixos/virtualbox-host: remove obsolete warnings (diff) | |
| download | nixpkgs-b538a69ce866ca7c519c513459d0b0c2cb472975.tar.gz | |
Merge pull request #327380 from NixOS/backport-321010-to-release-24.05
[Backport release-24.05] virtualboxKvm: 20240515 -> 20240617
| -rw-r--r-- | nixos/modules/virtualisation/virtualbox-host.nix | 14 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/default.nix | 7 |
2 files changed, 3 insertions, 18 deletions
diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index a34fe132ba7e..4808652a542a 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -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" ]; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 1edbddc8ea72..deae3b41449e 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -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. |