tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork atom

virtualbox: 6.1.4 -> 6.1.6

(cherry picked from commit 0481e09ad3bace6dc0c93791f031b62316041f4f)

authored by

Fabian Möller and committed by
Matteo Scarlata e5bea8e9 e0c113dc

+8 -4
+6 -2
pkgs/applications/virtualization/virtualbox/default.nix
··· 21 buildType = "release"; 22 # Use maintainers/scripts/update.nix to update the version and all related hashes or 23 # change the hashes in extpack.nix and guest-additions/default.nix as well manually. 24 - version = "6.1.4"; 25 26 iasl' = iasl.overrideAttrs (old: rec { 27 inherit (old) pname; ··· 38 39 src = fetchurl { 40 url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; 41 - sha256 = "59f8f5774473f593e3eb5940e2a337e0674bcd9854164b2578fd43f896260c99"; 42 }; 43 44 outputs = [ "out" "modsrc" ]; ··· 107 postPatch = '' 108 sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ 109 src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp 110 ''; 111 112 # first line: ugly hack, and it isn't yet clear why it's a problem
··· 21 buildType = "release"; 22 # Use maintainers/scripts/update.nix to update the version and all related hashes or 23 # change the hashes in extpack.nix and guest-additions/default.nix as well manually. 24 + version = "6.1.6"; 25 26 iasl' = iasl.overrideAttrs (old: rec { 27 inherit (old) pname; ··· 38 39 src = fetchurl { 40 url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; 41 + sha256 = "b031c30d770f28c5f884071ad933e8c1f83e65b93aaba03a4012077c1d90a54f"; 42 }; 43 44 outputs = [ "out" "modsrc" ]; ··· 107 postPatch = '' 108 sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ 109 src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp 110 + '' + optionalString headless '' 111 + # Fix compile error in version 6.1.6 112 + substituteInPlace src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11-stubs.cpp \ 113 + --replace PSHCLFORMATDATA PSHCLFORMATS 114 ''; 115 116 # first line: ugly hack, and it isn't yet clear why it's a problem
+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 = "3b73798d776ff223ea8025b1a45001762f8d4e5bcd1ea61449773c1249935800"; 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 = "80b96b4b51a502141f6a8981f1493ade08a00762622c39e48319e5b122119bf3"; 16 in assert (builtins.stringLength value) == 64; value; 17 18 meta = {
+1 -1
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
··· 26 27 src = fetchurl { 28 url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; 29 - sha256 = "e2846a7576cce1b92a7c0744f41eaac750248d6e31dfca5c45d5766648b394c7"; 30 }; 31 32 KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
··· 26 27 src = fetchurl { 28 url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; 29 + sha256 = "bcde4691dea7de93b65a10a43dda2b8f52e570f820992ad281c9bb5c8dede181"; 30 }; 31 32 KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";