diff options
5 files changed, 20 insertions, 18 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 0952fd1af080..3e502cde08b2 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -19,10 +19,10 @@ let python = python2; buildType = "release"; # Manually sha256sum the extensionPack file, must be hex! - extpack = "005ba9211862643e2516d549e98b80942918047f1f6c55fcfe08c490dd1947bc"; - extpackRev = "118431"; - main = "0m6y98pvkngprw5iaswvkbbfxmzvfl8yvgi984p1866zwap77z16"; - version = "5.2.0"; + extpack = "9328548ca8cbc526232c0631cb5a17618c771b07665b362c1e3d89a2425bf799"; + extpackRev = "119230"; + main = "05y03fcp013gc500q34bj6hvx1banib41v8l3hcxknzfgwq0rarm"; + version = "5.2.2"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 87b89a98e780..0aa0423fc13a 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,12 +19,14 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "1r6dybr3pfclffk7gppf7n8gwj3ziw7pmfvbwwkdw00q9ah7h5l4"; + sha256 = "1f0vm20qdjxqsbciwgybxqqpn609gj5dy68an8lpi1wlk93s05w3"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include"; + patchFlags = [ "-p1" "-d" "install/src/vboxguest-${version}" ]; + patches = [ ./fix_kerndir.patch ./fix_kernincl.patch diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch b/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch index e7feed853b12..0be949f63c92 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch @@ -1,7 +1,7 @@ -diff --git a/install/src/vboxguest-5.2.0/vboxsf/Makefile.include.header b/install/src/vboxguest-5.2.0/vboxsf/Makefile.include.header +diff --git a/vboxsf/Makefile.include.header b/vboxsf/Makefile.include.header index 8df1eb4d25..5a3e5604e7 100644 ---- a/install/src/vboxguest-5.2.0/vboxsf/Makefile.include.header -+++ b/install/src/vboxguest-5.2.0/vboxsf/Makefile.include.header +--- a/vboxsf/Makefile.include.header ++++ b/vboxsf/Makefile.include.header @@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) endif # neq($(KERNELRELEASE),) @@ -11,10 +11,10 @@ index 8df1eb4d25..5a3e5604e7 100644 $(error Error: unable to find the headers of the Linux kernel to build against. \ Specify KERN_VER=<version> and run Make again) -diff --git a/install/src/vboxguest-5.2.0/vboxguest/Makefile.include.header b/install/src/vboxguest-5.2.0/vboxguest/Makefile.include.header +diff --git a/vboxguest/Makefile.include.header b/vboxguest/Makefile.include.header index 8df1eb4d25..5a3e5604e7 100644 ---- a/install/src/vboxguest-5.2.0/vboxguest/Makefile.include.header -+++ b/install/src/vboxguest-5.2.0/vboxguest/Makefile.include.header +--- a/vboxguest/Makefile.include.header ++++ b/vboxguest/Makefile.include.header @@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) endif # neq($(KERNELRELEASE),) @@ -24,10 +24,10 @@ index 8df1eb4d25..5a3e5604e7 100644 $(error Error: unable to find the headers of the Linux kernel to build against. \ Specify KERN_VER=<version> and run Make again) -diff --git a/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header b/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header +diff --git a/vboxvideo/Makefile.include.header b/vboxvideo/Makefile.include.header index 8df1eb4d25..5a3e5604e7 100644 ---- a/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header -+++ b/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header +--- a/vboxvideo/Makefile.include.header ++++ b/vboxvideo/Makefile.include.header @@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) endif # neq($(KERNELRELEASE),) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch b/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch index 251394e5d13e..e59e2e98c1b3 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch @@ -1,7 +1,7 @@ -diff --git a/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header b/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header +diff --git a/vboxvideo/Makefile.include.header b/vboxvideo/Makefile.include.header index 8df1eb4d25..5a3e5604e7 100644 ---- a/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header -+++ b/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header +--- a/vboxvideo/Makefile.include.header ++++ b/vboxvideo/Makefile.include.header @@ -122,7 +122,6 @@ ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes) Specify KERN_VER=<version> and run Make again) endif diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5ffb39b8ca4..7c3f16573f8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12757,7 +12757,7 @@ with pkgs; }); # The current default kernel / kernel modules. - linuxPackages = linuxPackages_4_9; + linuxPackages = linuxPackages_4_14; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! |