Commit 56180e04 authored by Friedrich Altheide's avatar Friedrich Altheide
Browse files

virtualbox: 7.2.4 -> 7.2.6

parent b5382a73
Loading
Loading
Loading
Loading
+2 −15
Original line number Diff line number Diff line
@@ -72,9 +72,9 @@ 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.2.4";
  virtualboxVersion = "7.2.6";
  virtualboxSubVersion = "";
  virtualboxSha256 = "d281ec981b5f580211a0cedd1b75a1adcb0fbfcbb768d8c2bf4429f4763e8bbd";
  virtualboxSha256 = "c58443a0e6fcc7fc7e84c1011a10823b3540c6a2b8f2e27c4d8971272baf09f7";

  kvmPatchVboxVersion = "7.2.4";
  kvmPatchVersion = "20251103";
@@ -231,14 +231,6 @@ stdenv.mkDerivation (finalAttrs: {
        url = "https://salsa.debian.org/pkg-virtualbox-team/virtualbox/-/raw/8028d88e6876ca5977de13c58b54e243229efe98/debian/patches/16-no-update.patch";
        hash = "sha256-AGtFsRjwd8Yw296eqX3NC2TUptAhpFTRaOMutiheQ6Y=";
      })
      # NAT network shouldn't fully saturate one CPU
      # https://github.com/VirtualBox/virtualbox/issues/356
      (fetchpatch {
        name = "vbox-nat-cpu.patch";
        url = "https://github.com/VirtualBox/virtualbox/commit/efa378dadd192af8fbce331e9ec66fb36d65ad3d.diff";
        hash = "sha256-7u3kSszv77leZdMs911TzAchU5mBqmNpgvuZDQaY9To=";
        hunks = [ "2-" ];
      })
    ]
    ++ [ ./extra_symbols.patch ]
    # When hardening is enabled, we cannot use wrapQtApp to ensure that VirtualBoxVM sees
@@ -264,11 +256,6 @@ stdenv.mkDerivation (finalAttrs: {
      ./qt-dependency-paths.patch
      # https://github.com/NixOS/nixpkgs/issues/123851
      ./fix-audio-driver-loading.patch
      # curl 8.16 upgrade breakage
      (fetchpatch {
        url = "https://salsa.debian.org/pkg-virtualbox-team/virtualbox/-/raw/dbf9a6ef75380ebd2705df0198c6ac8073d0b4cb/debian/patches/new-curl.patch";
        hash = "sha256-WWnCWdXlJo9jTr8yXA0NxcDQBScryuu/53wyX0rhszk=";
      })
    ];

  postPatch = ''
+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
  virtualbox,
}:
let
  virtualboxExtPackVersion = "7.2.4";
  virtualboxExtPackVersion = "7.2.6";
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://download.virtualbox.org/virtualbox/${version}/SHA256SUMS
    let
      value = "b80ee54252442ec025d6a7b2b9c3f32526ab5c2d91a0ffa2385be3ed83bcff0b";
      value = "d46449366b23417a626439785f23f7eaf06bfbfd2cb030713e1abfa5b03d4205";
    in
    assert (builtins.stringLength value) == 64;
    value;
+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 = "66fa60b041fcda5d8b2ed22ba91bfafafaa3a5ff05c7d8ba01fbbe639669e153";
  sha256 = "740e9a729c944180a165188fd426f9a2e1a2581d654402a1b856f9755a1ffc97";
  meta = {
    description = "Guest additions ISO for VirtualBox";
    longDescription = ''
+2 −2
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@
  libx11,
}:
let
  virtualboxVersion = "7.2.4";
  virtualboxVersion = "7.2.6";
  virtualboxSubVersion = "";
  virtualboxSha256 = "d281ec981b5f580211a0cedd1b75a1adcb0fbfcbb768d8c2bf4429f4763e8bbd";
  virtualboxSha256 = "c58443a0e6fcc7fc7e84c1011a10823b3540c6a2b8f2e27c4d8971272baf09f7";

  platform =
    if stdenv.hostPlatform.isAarch64 then