pyrox.dev / nixpkgs
lol
fork atom

virtualbox: 6.1.22 -> 6.1.26 (#132223)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

authored by

Markus Partheymueller
Sandro and committed by
GitHub 5701e5bc cd9938d1

+18 -4
unified split
+5 -2
pkgs/applications/virtualization/virtualbox/default.nix
··· 23 buildType = "release"; 24 # Use maintainers/scripts/update.nix to update the version and all related hashes or 25 # change the hashes in extpack.nix and guest-additions/default.nix as well manually. 26 - version = "6.1.22"; 27 28 iasl' = iasl.overrideAttrs (old: rec { 29 inherit (old) pname; ··· 40 41 src = fetchurl { 42 url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; 43 - sha256 = "99816d2a15205d49362a31e8ffeb8262d2fa0678c751dfd0a7c43b2faca8be49"; 44 }; 45 46 outputs = [ "out" "modsrc" ]; ··· 104 }) 105 ++ [ 106 ./qtx11extras.patch 107 ]; 108 109 postPatch = ''
··· 23 buildType = "release"; 24 # Use maintainers/scripts/update.nix to update the version and all related hashes or 25 # change the hashes in extpack.nix and guest-additions/default.nix as well manually. 26 + version = "6.1.26"; 27 28 iasl' = iasl.overrideAttrs (old: rec { 29 inherit (old) pname; ··· 40 41 src = fetchurl { 42 url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; 43 + sha256 = "0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195"; 44 }; 45 46 outputs = [ "out" "modsrc" ]; ··· 104 }) 105 ++ [ 106 ./qtx11extras.patch 107 + # Temporary workaround for broken build 108 + # https://www.virtualbox.org/pipermail/vbox-dev/2021-July/015670.html 109 + ./fix-configure-pkgconfig-qt.patch 110 ]; 111 112 postPatch = ''
+1 -1
pkgs/applications/virtualization/virtualbox/extpack.nix
··· 12 # Manually sha256sum the extensionPack file, must be hex! 13 # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. 14 # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS 15 - let value = "6d33d9cc1c5a8f8a2a70e5aaaa778a341322d2ba7eb34f7de420fb5f312b9e87"; 16 in assert (builtins.stringLength value) == 64; value; 17 18 meta = {
··· 12 # Manually sha256sum the extensionPack file, must be hex! 13 # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. 14 # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS 15 + let value = "aaa1a1f8615d5bd2e08b158ce6f415262fbb595e169e2d415c5b1844ac258eee"; 16 in assert (builtins.stringLength value) == 64; value; 17 18 meta = {
+11
pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch
···
··· 1 + Index: /trunk/configure 2 + =================================================================== 3 + --- a/configure (revision 90360) 4 + +++ b/configure (revision 90377) 5 + @@ -1588,5 +1588,5 @@ 6 + if [ $? -eq 0 ]; then 7 + echo "(Qt5 from pkg-config)" >> $LOG 8 + - FLGQT5=`pkg-config Qt5Core Qt5Gui --cflags` 9 + + FLGQT5=`pkg-config Qt5Core --cflags` 10 + # gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in Config.kmk) 11 + [ $(($cc_maj * 100 + $cc_min)) -ge 408 ] && FLGQT5="$FLGQT5 -std=c++11"
+1 -1
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
··· 27 28 src = fetchurl { 29 url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; 30 - sha256 = "bffc316a7b8d5ed56d830e9f6aef02b4e5ffc28674032142e96ffbedd905f8c9"; 31 }; 32 33 KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
··· 27 28 src = fetchurl { 29 url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; 30 + sha256 = "22d02ec417cd7723d7269dbdaa71c48815f580c0ca7a0606c42bd623f84873d7"; 31 }; 32 33 KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";