Unverified Commit c46f18df authored by Fabián Heredia Montiel's avatar Fabián Heredia Montiel Committed by GitHub
Browse files

virtualbox: 7.1.12 -> 7.2.0 (#435491)

parents cee321e6 769479a6

pkgs/applications/virtualization/virtualbox/default.nix

+12 −19
Original line number Diff line number Diff line
@@ -72,12 +72,13 @@ let 
  buildType = "release";

  # Use maintainers/scripts/update.nix to update the version and all related hashes or

  # change the hashes in extpack.nix and guest-additions/default.nix as well manually.

  virtualboxVersion = "7.1.12";

  virtualboxVersion = "7.2.0";

  virtualboxSubVersion = "";

  virtualboxSha256 = "6f9618f39168898134975f51df7c2d6d5129c0aa82b6ae11cf47f920c70df276";

  virtualboxSha256 = "4f2804ff27848ea772aee6b637bb1e10ee74ec2da117c257413e2d2c4f670ba0";



  kvmPatchVersion = "20250207";

  kvmPatchHash = "sha256-GzRLIXhzWL1NLvaGKcWVBCdvay1IxgJUE4koLX1ze7Y=";

  kvmPatchVboxVersion = "7.2.0";

  kvmPatchVersion = "20250903";

  kvmPatchHash = "sha256-JTE9Kr+nJ6HLeDrzL2EVyDQhxzn3UsoQVIQ6zNCwioY=";



  # The KVM build is not compatible to VirtualBox's kernel modules. So don't export

  # modsrc at all.
@@ -231,8 +232,8 @@ stdenv.mkDerivation (finalAttrs: { 
      # No update patch disables check for update function

      # https://bugs.launchpad.net/ubuntu/+source/virtualbox-ose/+bug/272212

      (fetchpatch {

        url = "https://salsa.debian.org/pkg-virtualbox-team/virtualbox/-/raw/42a1ca1291fde365bfba140cb21a8a074aaccce2/debian/patches/16-no-update.patch";

        hash = "sha256-qM2e4DkkpmA18Z76OUsnY1MhcGb1dT2PG68JUy6fZEE=";

        url = "https://salsa.debian.org/pkg-virtualbox-team/virtualbox/-/raw/8028d88e6876ca5977de13c58b54e243229efe98/debian/patches/16-no-update.patch";

        hash = "sha256-AGtFsRjwd8Yw296eqX3NC2TUptAhpFTRaOMutiheQ6Y=";

      })

    ]

    ++ [ ./extra_symbols.patch ]
@@ -250,23 +251,15 @@ stdenv.mkDerivation (finalAttrs: { 
    )

    # While the KVM patch should not break any other behavior if --with-kvm is not specified,

    # we don't take any chances and only apply it if people actually want to use KVM support.

    ++ optional enableKvm (

      let

        patchVboxVersion =

          # There is no updated patch for 7.1.12 yet, but the older one still applies.

          if finalAttrs.virtualboxVersion == "7.1.12" then "7.1.6" else finalAttrs.virtualboxVersion;

      in

      fetchpatch {

    ++ optional enableKvm (fetchpatch {

      name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch";

        url = "https://github.com/cyberus-technology/virtualbox-kvm/releases/download/dev-${finalAttrs.kvmPatchVersion}/kvm-backend-${patchVboxVersion}-dev-${finalAttrs.kvmPatchVersion}.patch";

      url = "https://github.com/cyberus-technology/virtualbox-kvm/releases/download/dev-${finalAttrs.kvmPatchVersion}/kvm-backend-${kvmPatchVboxVersion}-dev-${finalAttrs.kvmPatchVersion}.patch";

      hash = finalAttrs.kvmPatchHash;

      }

    )

    })

    ++ [

      ./qt-dependency-paths.patch

      # https://github.com/NixOS/nixpkgs/issues/123851

      ./fix-audio-driver-loading.patch

      ./fix-graphics-driver-loading.patch

    ];



  postPatch = ''

pkgs/applications/virtualization/virtualbox/extpack.nix

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
  virtualbox,

}:

let

  virtualboxExtPackVersion = "7.1.12";

  virtualboxExtPackVersion = "7.2.0";

in

fetchurl rec {

  name = "Oracle_VirtualBox_Extension_Pack-${virtualboxExtPackVersion}.vbox-extpack";
@@ -14,7 +14,7 @@ fetchurl rec { 
    # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.

    # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS

    let

      value = "c7ed97f4755988ecc05ec633475e299bbc1e0418cc3d143747a45c99df53abd3";

      value = "8a44f3eeaf9bb71fab297bf4b3d38bd1bc55243f3c1a12bfb0e8d78170f949a0";

    in

    assert (builtins.stringLength value) == 64;

    value;

pkgs/applications/virtualization/virtualbox/fix-graphics-driver-loading.patch

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
diff --git a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-dx11.cpp b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-dx11.cpp

index 1a43382..c376d6e 100644

--- a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-dx11.cpp

+++ b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-dx11.cpp

@@ -3376,7 +3376,7 @@ static DECLCALLBACK(int) vmsvga3dBackInit(PPDMDEVINS pDevIns, PVGASTATE pThis, P

     AssertReturn(pBackend, VERR_NO_MEMORY);

     pThisCC->svga.p3dState->pBackend = pBackend;

 

-    rc = RTLdrLoadSystem(VBOX_D3D11_LIBRARY_NAME, /* fNoUnload = */ true, &pBackend->hD3D11);

+    rc = RTLdrLoad(VBOX_D3D11_LIBRARY_NAME, &pBackend->hD3D11);

     AssertRC(rc);

     if (RT_SUCCESS(rc))

     {

pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
}:

fetchurl {

  url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso";

  sha256 = "256883e2eabf7ab5c10fb3b6831c294942ce34bc615807f9d0cf6c3d2e882236";

  sha256 = "43f7a1045cad0aab40e3af906fea37244ba6873b91b4e227245a14e51b399abd";

  meta = {

    description = "Guest additions ISO for VirtualBox";

    longDescription = ''

pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix

+0 −3
Original line number Diff line number Diff line
@@ -78,9 +78,6 @@ stdenv.mkDerivation (finalAttrs: { 
    rm -r src/libs/zlib*/

  '';



  # Apply fix for: https://www.virtualbox.org/ticket/22397

  patches = lib.optional stdenv.hostPlatform.isAarch64 ./guest-additions-aarch64-fix.patch;



  postPatch = ''

    set -x

    sed -e 's@MKISOFS --version@MKISOFS -version@' \