mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 14:11:36 +00:00
Code Issues Wiki Activity

Merge pull request #32983 from flokli/virtualbox-5.2.4

Browse source 
virtualbox: 5.2.2 -> 5.2.4
This commit is contained in:
Orivej Desh 2017-12-23 16:29:59 +00:00 committed by GitHub
parent b13217b6e5 0543dc77b1
commit c3cfdc17bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nixos/tests/virtualbox.nix
View file

@ -109,9 +109,6 @@ let
} ''
${pkgs.parted}/sbin/parted --script /dev/vda mklabel msdos
${pkgs.parted}/sbin/parted --script /dev/vda -- mkpart primary ext2 1M -1s
. /sys/class/block/vda1/uevent
mknod /dev/vda1 b $MAJOR $MINOR
${pkgs.e2fsprogs}/sbin/mkfs.ext4 /dev/vda1
${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
mkdir /mnt

12
pkgs/applications/virtualization/virtualbox/default.nix
View file

@ -20,10 +20,11 @@ let
python = python2;
buildType = "release";
# Manually sha256sum the extensionPack file, must be hex!
extpack = "9328548ca8cbc526232c0631cb5a17618c771b07665b362c1e3d89a2425bf799";
extpackRev = "119230";
main = "05y03fcp013gc500q34bj6hvx1banib41v8l3hcxknzfgwq0rarm";
version = "5.2.2";
# Do not forget to update the hash in ./guest-additions/default.nix!
extpack = "98e9df4f23212c3de827af9d770b391cf2dba8d21f4de597145512c1479302cd";
extpackRev = "119785";
main = "053xpf0kxrig4jq5djfz9drhkxy1x5a4p9qvgxc0b3hnk6yn1869";
version = "5.2.4";
# See https://github.com/NixOS/nixpkgs/issues/672 for details
extensionPack = requireFile rec {
@ -205,8 +206,9 @@ in stdenv.mkDerivation {
meta = {
description = "PC emulator";
license = licenses.gpl2;
homepage = http://www.virtualbox.org/;
maintainers = [ lib.maintainers.sander ];
maintainers = with maintainers; [ flokli sander ];
platforms = [ "x86_64-linux" "i686-linux" ];
};
}

2
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View file

@ -19,7 +19,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
sha256 = "1f0vm20qdjxqsbciwgybxqqpn609gj5dy68an8lpi1wlk93s05w3";
sha256 = "0qhsr6vc48ld2p9q3a6n6rfg57rsn163axr3r1m2yqr2snr4pnk0";
};
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";