about summary refs log tree commit diff
path: root/pkgs/applications/virtualization/virtualbox
diff options
context:
space:
mode:
authorTim Steinbach <NeQuissimus@users.noreply.github.com>2017-06-22 21:23:47 -0400
committerGitHub <noreply@github.com>2017-06-22 21:23:47 -0400
commit6fb9f892382b4b091fc9edcae00e2eb4c0729bda (patch)
treef0eefe31c618154de19160db4771ef2f69b530a7 /pkgs/applications/virtualization/virtualbox
parent4e08459f9b98200949df65f2a4805e56a8d6b12e (diff)
parentc4a48600bf1441fdba94cee09402663763bee895 (diff)
downloadnixlib-6fb9f892382b4b091fc9edcae00e2eb4c0729bda.tar
nixlib-6fb9f892382b4b091fc9edcae00e2eb4c0729bda.tar.gz
nixlib-6fb9f892382b4b091fc9edcae00e2eb4c0729bda.tar.bz2
nixlib-6fb9f892382b4b091fc9edcae00e2eb4c0729bda.tar.lz
nixlib-6fb9f892382b4b091fc9edcae00e2eb4c0729bda.tar.xz
nixlib-6fb9f892382b4b091fc9edcae00e2eb4c0729bda.tar.zst
nixlib-6fb9f892382b4b091fc9edcae00e2eb4c0729bda.zip
Merge pull request #25368 from bachp/virtualbox-5.1.22
virtualbox: 5.1.18 -> 5.1.22
Diffstat (limited to 'pkgs/applications/virtualization/virtualbox')
-rw-r--r--pkgs/applications/virtualization/virtualbox/default.nix9
-rw-r--r--pkgs/applications/virtualization/virtualbox/guest-additions/default.nix4
2 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 32e8f9d23f4b..7567b3d3511d 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -17,11 +17,10 @@ with stdenv.lib;
 let
   python = python2;
   buildType = "release";
-
-  extpack = "996f783996a597d3936fc5f1ccf56edd31ae1f8fb4d527009647d9a2c8c853cd";
-  extpackRev = "114002";
-  main = "7ed0959bbbd02826b86b3d5dc8348931ddfab267c31f8ed36ee53c12f5522cd9";
-  version = "5.1.18";
+  extpack = "244e6f450cba64e0b025711050db3c43e6ce77e12cd80bcd08796315a90c8aaf";
+  extpackRev = "115126";
+  main = "fcc918000b8c5ece553541ec10a9182410a742b7266257c76dda895dcd389899";
+  version = "5.1.22";
 
   # 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 38f452efe6cc..3c9f28f4f2d5 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "f2951b49f48a560fbc1afe9d135d1f3f82a3e158b9002278d05d978428adca8a";
+    sha256 = "54df14f234b6aa484b94939ab0f435b5dd859417612b65a399ecc34a62060380";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";
@@ -139,7 +139,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Guest additions for VirtualBox";
-    longDescriptions = ''
+    longDescription = ''
       Various add-ons which makes NixOS work better as guest OS inside VirtualBox.
       This add-on provides support for dynamic resizing of the X Display, shared
       host/guest clipboard support and guest OpenGL support.