virtualbox: 7.1.8 -> 7.1.10

This commit is contained in:
André Lima 2025-06-04 23:47:39 +00:00
parent 9c09d5e27c
commit 96c8709d82
No known key found for this signature in database
GPG key ID: F55F5AE242E116E4
5 changed files with 10 additions and 13 deletions

View file

@ -16,7 +16,6 @@
libXcursor,
libXfixes,
libXmu,
libIDL,
SDL2,
libcap,
libGL,
@ -74,9 +73,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.1.8";
virtualboxVersion = "7.1.10";
virtualboxSubVersion = "";
virtualboxSha256 = "3f7132c55ac6c5f50585bfaa115d29e30b47ccf535cb0a12ff50214ddae2f63d";
virtualboxSha256 = "7d60010a4c9102613554b46f61d17b825c30ee59d8be071e52d8aac664ca9869";
kvmPatchVersion = "20250207";
kvmPatchHash = "sha256-GzRLIXhzWL1NLvaGKcWVBCdvay1IxgJUE4koLX1ze7Y=";
@ -148,7 +147,6 @@ stdenv.mkDerivation (finalAttrs: {
libX11
libXext
libXcursor
libIDL
libcap
glib
lvm2
@ -249,8 +247,8 @@ stdenv.mkDerivation (finalAttrs: {
++ optional enableKvm (
let
patchVboxVersion =
# 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;
# There is no updated patch for 7.1.10 yet, but the older one still applies.
if finalAttrs.virtualboxVersion == "7.1.10" then "7.1.6" else finalAttrs.virtualboxVersion;
in
fetchpatch {
name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch";
@ -320,7 +318,7 @@ stdenv.mkDerivation (finalAttrs: {
${optionalString (enableKvm) "--with-kvm"} \
${extraConfigureFlags} \
--disable-kmods
sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${glib.dev}/lib/pkgconfig@' \
-i AutoConfig.kmk
sed -e 's@arch/x86/@@' \
-i Config.kmk

View file

@ -4,7 +4,7 @@
virtualbox,
}:
let
virtualboxExtPackVersion = "7.1.8";
virtualboxExtPackVersion = "7.1.10";
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 = "912586a3a1e9285f9df264f7999e6fffc0b8a42f2e013dd898a86f7ed3975d37";
value = "e020755711849fa0ee23d3bc47bc90cb0ea595da7dda804499568a0dc2387989";
in
assert (builtins.stringLength value) == 64;
value;

View file

@ -5,7 +5,7 @@
}:
fetchurl {
url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso";
sha256 = "0001ed19cc389f04723c9b911338559b9b74bea0d24edf794d8d2ce5b5cb14e0";
sha256 = "59c92f7f5fd7e081211e989f5117fc53ad8d8800ad74a01b21e97bb66fe62972";
meta = {
description = "Guest additions ISO for VirtualBox";
longDescription = ''

View file

@ -12,9 +12,9 @@
libX11,
}:
let
virtualboxVersion = "7.1.8";
virtualboxVersion = "7.1.10";
virtualboxSubVersion = "";
virtualboxSha256 = "3f7132c55ac6c5f50585bfaa115d29e30b47ccf535cb0a12ff50214ddae2f63d";
virtualboxSha256 = "7d60010a4c9102613554b46f61d17b825c30ee59d8be071e52d8aac664ca9869";
virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix {
inherit virtualboxVersion virtualboxSubVersion virtualboxSha256;

View file

@ -14346,7 +14346,6 @@ with pkgs;
virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox {
stdenv = stdenv_32bit;
inherit (gnome2) libIDL;
# VirtualBox uses wsimport, which was removed after JDK 8.
jdk = jdk8;