Skip to content

Conversation

@FriedrichAltheide
Copy link
Contributor

  • Bump virtualbox and virtualboxGuestAdditions

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Apr 20, 2025
@LeSuisse
Copy link
Member

@LeSuisse LeSuisse added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Apr 22, 2025
@FriedrichAltheide FriedrichAltheide marked this pull request as ready for review April 22, 2025 12:02
@FriedrichAltheide
Copy link
Contributor Author

@muellerbernd could you (or someone else) please run nixpkgs-review and post the output. Thank you.

@nix-owners nix-owners bot requested review from blitz and svanderburg April 22, 2025 12:10
@muellerbernd
Copy link

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 400278


x86_64-linux

⏩ 4 packages marked as broken and skipped:
  • linuxKernel.packages.linux_5_4_hardened.virtualbox
  • linuxKernel.packages.linux_5_4_hardened.virtualboxGuestAdditions
  • linuxPackages_5_4_hardened.virtualbox
  • linuxPackages_5_4_hardened.virtualboxGuestAdditions
❌ 5 packages failed to build:
  • linuxKernel.packages.linux_5_10.virtualbox
  • linuxKernel.packages.linux_5_10.virtualboxGuestAdditions
  • linuxPackages_latest-libre.virtualbox (linuxKernel.packages.linux_latest_libre.virtualbox)
  • linuxPackages_latest-libre.virtualboxGuestAdditions (linuxKernel.packages.linux_latest_libre.virtualboxGuestAdditions)
  • virtualboxKvm
✅ 47 packages built:
  • linuxPackages_5_10_hardened.virtualbox (linuxKernel.packages.linux_5_10_hardened.virtualbox)
  • linuxPackages_5_10_hardened.virtualboxGuestAdditions (linuxKernel.packages.linux_5_10_hardened.virtualboxGuestAdditions)
  • linuxKernel.packages.linux_5_15.virtualbox
  • linuxKernel.packages.linux_5_15.virtualboxGuestAdditions
  • linuxPackages_5_15_hardened.virtualbox (linuxKernel.packages.linux_5_15_hardened.virtualbox)
  • linuxPackages_5_15_hardened.virtualboxGuestAdditions (linuxKernel.packages.linux_5_15_hardened.virtualboxGuestAdditions)
  • linuxKernel.packages.linux_5_4.virtualbox
  • linuxKernel.packages.linux_5_4.virtualboxGuestAdditions
  • linuxKernel.packages.linux_6_1.virtualbox
  • linuxKernel.packages.linux_6_1.virtualboxGuestAdditions
  • linuxPackages.virtualbox (linuxKernel.packages.linux_6_12.virtualbox)
  • linuxPackages.virtualboxGuestAdditions (linuxKernel.packages.linux_6_12.virtualboxGuestAdditions)
  • linuxPackages_hardened.virtualbox (linuxPackages_6_12_hardened.virtualbox)
  • linuxPackages_hardened.virtualboxGuestAdditions (linuxPackages_6_12_hardened.virtualboxGuestAdditions)
  • linuxKernel.packages.linux_6_13.virtualbox
  • linuxKernel.packages.linux_6_13.virtualboxGuestAdditions
  • linuxPackages_6_13_hardened.virtualbox (linuxKernel.packages.linux_6_13_hardened.virtualbox)
  • linuxPackages_6_13_hardened.virtualboxGuestAdditions (linuxKernel.packages.linux_6_13_hardened.virtualboxGuestAdditions)
  • linuxPackages_latest.virtualbox (linuxKernel.packages.linux_6_14.virtualbox)
  • linuxPackages_latest.virtualboxGuestAdditions (linuxKernel.packages.linux_6_14.virtualboxGuestAdditions)
  • linuxPackages_6_1_hardened.virtualbox (linuxKernel.packages.linux_6_1_hardened.virtualbox)
  • linuxPackages_6_1_hardened.virtualboxGuestAdditions (linuxKernel.packages.linux_6_1_hardened.virtualboxGuestAdditions)
  • linuxKernel.packages.linux_6_6.virtualbox
  • linuxKernel.packages.linux_6_6.virtualboxGuestAdditions
  • linuxPackages_6_6_hardened.virtualbox (linuxKernel.packages.linux_6_6_hardened.virtualbox)
  • linuxPackages_6_6_hardened.virtualboxGuestAdditions (linuxKernel.packages.linux_6_6_hardened.virtualboxGuestAdditions)
  • linuxPackages_ham.virtualbox (linuxKernel.packages.linux_ham.virtualbox)
  • linuxPackages_ham.virtualboxGuestAdditions (linuxKernel.packages.linux_ham.virtualboxGuestAdditions)
  • linuxPackages-libre.virtualbox (linuxKernel.packages.linux_libre.virtualbox)
  • linuxPackages-libre.virtualboxGuestAdditions (linuxKernel.packages.linux_libre.virtualboxGuestAdditions)
  • linuxPackages_lqx.virtualbox (linuxKernel.packages.linux_lqx.virtualbox)
  • linuxPackages_lqx.virtualboxGuestAdditions (linuxKernel.packages.linux_lqx.virtualboxGuestAdditions)
  • linuxPackages_xanmod.virtualbox (linuxKernel.packages.linux_xanmod.virtualbox)
  • linuxPackages_xanmod.virtualboxGuestAdditions (linuxKernel.packages.linux_xanmod.virtualboxGuestAdditions)
  • linuxPackages_xanmod_latest.virtualbox (linuxKernel.packages.linux_xanmod_latest.virtualbox ,linuxPackages_xanmod_stable.virtualbox)
  • linuxPackages_xanmod_latest.virtualboxGuestAdditions (linuxKernel.packages.linux_xanmod_latest.virtualboxGuestAdditions ,linuxPackages_xanmod_stable.virtualboxGuestAdditions)
  • linuxPackages_zen.virtualbox (linuxKernel.packages.linux_zen.virtualbox)
  • linuxPackages_zen.virtualboxGuestAdditions (linuxKernel.packages.linux_zen.virtualboxGuestAdditions)
  • virtualbox
  • virtualbox.modsrc
  • virtualboxExtpack
  • virtualboxHardened
  • virtualboxHardened.modsrc
  • virtualboxHeadless
  • virtualboxHeadless.modsrc
  • virtualboxWithExtpack
  • virtualboxWithExtpack.modsrc

virtualboxSubVersion = "";
virtualboxSha256 = "3f7132c55ac6c5f50585bfaa115d29e30b47ccf535cb0a12ff50214ddae2f63d";

kvmPatchVersion = "20250207";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

KVM patch for 7.1.6 still applies with 7.1.8, we might want to adjust the build to avoid breaking virtualbox-kvm

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 524b873be198..6a4bddaaab2b 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -249,8 +249,8 @@ stdenv.mkDerivation (finalAttrs: {
     ++ optional enableKvm (
       let
         patchVboxVersion =
-          # There is no updated patch for 7.0.22 yet, but the older one still applies.
-          if finalAttrs.virtualboxVersion == "7.0.22" then "7.0.20" else finalAttrs.virtualboxVersion;
+          # There is no updated patch for 7.1.8 yet, but the older one still applies.
+          if finalAttrs.virtualboxVersion == "7.1.8" then "7.1.6" else finalAttrs.virtualboxVersion;
       in
       fetchpatch {
         name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch";

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer your proposed change as a separate PR

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer to have it in the same PR, as otherwise this breaks the virtualbox-kvm build needlessly. In general, we may consider moving virtualbox-kvm to a separate package, so the versions can be bumped independently when the KVM patch does not apply.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pushed the change to re-use the 7.1.6 patch for virtualboxKvm so we do not break it.

Copy link
Contributor

@Yarny0 Yarny0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review per https://github.com/NixOS/nixpkgs/tree/f771eb401a46846c1aebd20552521b233dd7e18b/pkgs#package-updates

Reviewed points
  • package name fits guidelines
  • package version fits guidelines
  • package builds on x86-64
  • executables tested on ARCHITECTURE
  • all depending packages build
  • patches have a comment describing either the upstream URL or a reason why the patch wasn't upstreamed
  • patches that are remotely available are fetched rather than vendored
Comments

After cherry-picking the commit onto the current nixos-unstable, I prepared a network boot image with NixOS (with the new vbox guest additions, and X11/Plasma5) and booted the image inside the new virtualbox host version on a NixOS. Works all nice for me!

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Apr 26, 2025
@FriedrichAltheide
Copy link
Contributor Author

This PR should be merged together with #352640

@snpschaaf snpschaaf added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Apr 29, 2025
@wegank wegank added 12.approvals: 3+ This PR was reviewed and approved by three or more persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. and removed 12.approvals: 2 This PR was reviewed and approved by two persons. labels May 1, 2025
@LeSuisse LeSuisse merged commit 65a76e2 into NixOS:master May 1, 2025
27 of 29 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented May 1, 2025

Successfully created backport PR for release-24.11:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 12.approvals: 3+ This PR was reviewed and approved by three or more persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants