Unverified Commit d5afab55 authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #311362 from FriedrichAltheide/virtualbox-7.0.18 

virtualbox & virtualboxGuestAdditions: 7.0.14 -> 7.0.18
parents e8c4a891 d67961fe

pkgs/applications/virtualization/virtualbox/default.nix

+4 −6
Original line number Diff line number Diff line
@@ -32,11 +32,11 @@ 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.0.14";

  virtualboxSha256 = "45860d834804a24a163c1bb264a6b1cb802a5bc7ce7e01128072f8d6a4617ca9";

  virtualboxVersion = "7.0.18";

  virtualboxSha256 = "d999513533631674a024762668de999411d8197060c51e68c5faf0a2c0eea1a5";



  kvmPatchVersion = "20240502";

  kvmPatchHash = "sha256-KokIrrAoJutHzPg6e5YAJgDGs+nQoVjapmyn9kG5tV0=";

  kvmPatchVersion = "20240515";

  kvmPatchHash = "sha256-Kh/tlPScdf7CbEEpL54iqMpeUIdmnJL2r/mxnlEzLd0=";



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

  # modsrc at all.
@@ -135,8 +135,6 @@ in stdenv.mkDerivation (finalAttrs: { 
    ./qt-dependency-paths.patch

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

    ./fix-audio-driver-loading.patch

    ./libxml-2.12.patch

    ./gcc-13.patch

  ];



  postPatch = ''

pkgs/applications/virtualization/virtualbox/extpack.nix

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ fetchurl rec { 
    # Manually sha256sum the extensionPack file, must be hex!

    # 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 = "42cb36fbf439a9ed28c95d2bbc718a0eac902225eb579c884c549af2e94be633";

    let value = "cab1abad478679fc34a0c5cb4a6d3566edc20e3c54cbed39c8e895d8cfad3ee2";

    in assert (builtins.stringLength value) == 64; value;



  meta = {

pkgs/applications/virtualization/virtualbox/gcc-13.patch

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
diff --git a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibRuntimeXF86.cpp b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibRuntimeXF86.cpp

index 8a9d15c0..260ebc5c 100644

--- a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibRuntimeXF86.cpp

+++ b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibRuntimeXF86.cpp

@@ -46,6 +46,9 @@

 #if defined(VBOX_VBGLR3_XFREE86)

 extern "C" {

 # define XFree86LOADER

+# ifdef RT_GNUC_PREREQ(13,0) /* cmath gets dragged in and the c++/13/cmath header is allergic to -ffreestanding.  */

+#  define _GLIBCXX_INCLUDE_NEXT_C_HEADERS

+# endif

 # include <xf86_ansic.h>

 # undef size_t

 }

diff --git a/src/libs/dxvk-native-1.9.2a/src/util/util_matrix.cpp b/src/libs/dxvk-native-1.9.2a/src/util/util_matrix.cpp

index 2c5e9314..64890169 100644

--- a/src/libs/dxvk-native-1.9.2a/src/util/util_matrix.cpp

+++ b/src/libs/dxvk-native-1.9.2a/src/util/util_matrix.cpp

@@ -1,3 +1,5 @@

+#include <cstdint>

+

 #include "util_matrix.h"

 

 namespace dxvk {

diff --git a/src/libs/dxvk-native-1.9.2a/src/util/util_vector.h b/src/libs/dxvk-native-1.9.2a/src/util/util_vector.h

index 77cdf294..9dcb4bf9 100644

--- a/src/libs/dxvk-native-1.9.2a/src/util/util_vector.h

+++ b/src/libs/dxvk-native-1.9.2a/src/util/util_vector.h

@@ -1,5 +1,6 @@

 #pragma once

 

+#include <cstdint>

 #include <iostream>

 

 #include "util_bit.h"

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

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ let 
in

fetchurl {

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

  sha256 = "0efbcb9bf4722cb19292ae00eba29587432e918d3b1f70905deb70f7cf78e8ce";

  sha256 = "4469bab0f59c62312b0a1b67dcf9c07a8a971afad339fa2c3eb80e209e099ef9";

  meta = {

    description = "Guest additions ISO for VirtualBox";

    longDescription = ''

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

+4 −8
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ let 


in stdenv.mkDerivation (finalAttrs: {

  pname = "VirtualBox-GuestAdditions-builder-${kernel.version}";

  version = "7.0.14";

  version = "7.0.18";



  src = fetchurl {

    url = "https://download.virtualbox.org/virtualbox/${finalAttrs.version}/VirtualBox-${finalAttrs.version}.tar.bz2";

    sha256 = "45860d834804a24a163c1bb264a6b1cb802a5bc7ce7e01128072f8d6a4617ca9";

    sha256 = "d999513533631674a024762668de999411d8197060c51e68c5faf0a2c0eea1a5";

  };



  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration";
@@ -37,13 +37,9 @@ in stdenv.mkDerivation (finalAttrs: { 
  '';



  patches = [

    ../gcc-13.patch

    # https://www.virtualbox.org/changeset/100258/vbox

    #../gcc-13.patch

    ## https://www.virtualbox.org/changeset/100258/vbox

    ./no-legacy-xorg.patch

    # https://www.virtualbox.org/changeset/102989/vbox

    ./strlcpy-1.patch

    # https://www.virtualbox.org/changeset/102990/vbox

    ./strlcpy-2.patch

  ];



  postPatch = ''