summary refs log tree commit diff
path: root/pkgs/applications/virtualization
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2012-07-03 13:57:45 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-07-03 08:44:35 -0400
commit8a5d9bad94c8e35883fbe42efb56b451f0e07f2c (patch)
treef97a5614b064bd183ded8e2d157dfb404dae9231 /pkgs/applications/virtualization
parentef1d8eb915404ee55a5edbf6636228f5ab337dc6 (diff)
downloadnixpkgs-8a5d9bad94c8e35883fbe42efb56b451f0e07f2c.tar
nixpkgs-8a5d9bad94c8e35883fbe42efb56b451f0e07f2c.tar.gz
nixpkgs-8a5d9bad94c8e35883fbe42efb56b451f0e07f2c.tar.bz2
nixpkgs-8a5d9bad94c8e35883fbe42efb56b451f0e07f2c.tar.lz
nixpkgs-8a5d9bad94c8e35883fbe42efb56b451f0e07f2c.tar.xz
nixpkgs-8a5d9bad94c8e35883fbe42efb56b451f0e07f2c.tar.zst
nixpkgs-8a5d9bad94c8e35883fbe42efb56b451f0e07f2c.zip
Update VirtualBox to version 4.1.18.
This should make #15 obsolete, as those patches were cherry-picked from
upstream.
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r--pkgs/applications/virtualization/virtualbox/default.nix4
-rw-r--r--pkgs/applications/virtualization/virtualbox/guest-additions/default.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 1e17c10ffd2..2736c603a48 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -8,7 +8,7 @@
 
 with stdenv.lib;
 
-let version = "4.1.16"; in
+let version = "4.1.18"; in
 
 stdenv.mkDerivation {
   name = "virtualbox-${version}-${kernel.version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "0kl21wqz822qgdcilfail5qqgsbhgzixwbbwpkmsh6670jc4jw5n";
+    sha256 = "e650e4fdc23581b9edc0e5d5705cc596c76796851ebf65ccda0edb8e413fa3b7";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 7583b706e4c..ec77ca91910 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
 , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}:
 
-let version = "4.1.16"; in
+let version = "4.1.18"; in
 
 stdenv.mkDerivation {
   name = "VirtualBox-GuestAdditions-${version}";
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "1f2p26cg005xc6vi9dbim0macv60d8k8nq20rk7awrbghfib5imm";
+    sha256 = "1zsjh4q71ny10s2zaxnaw4w3bs961c21xv6dd6zpwhnbimlhlrqb";
   };
   KERN_DIR = "${kernel}/lib/modules/*/build";
   buildInputs = [ patchelf cdrkit makeWrapper ];