diff options
author | David Guibert <david.guibert@gmail.com> | 2016-08-10 12:15:31 +0200 |
---|---|---|
committer | Gabriel Ebner <gebner@gebner.org> | 2016-08-28 13:45:49 +0200 |
commit | 21f2f3074063017a6580fc1c5889ee54094160ff (patch) | |
tree | 80310c9f3e737bd9ce701fdfa63cff087184f6b4 /pkgs/applications/virtualization | |
parent | f0da094b2e2e885e4c2ea7930583c6fa302add0f (diff) | |
download | nixlib-21f2f3074063017a6580fc1c5889ee54094160ff.tar nixlib-21f2f3074063017a6580fc1c5889ee54094160ff.tar.gz nixlib-21f2f3074063017a6580fc1c5889ee54094160ff.tar.bz2 nixlib-21f2f3074063017a6580fc1c5889ee54094160ff.tar.lz nixlib-21f2f3074063017a6580fc1c5889ee54094160ff.tar.xz nixlib-21f2f3074063017a6580fc1c5889ee54094160ff.tar.zst nixlib-21f2f3074063017a6580fc1c5889ee54094160ff.zip |
virtualbox: 5.0.20 -> 5.0.26
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r-- | pkgs/applications/virtualization/virtualbox/default.nix | 17 | ||||
-rw-r--r-- | pkgs/applications/virtualization/virtualbox/guest-additions/default.nix | 2 |
2 files changed, 6 insertions, 13 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index ebdac411b113..71e719edf6df 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -18,7 +18,7 @@ let # revision/hash as well. See # http://download.virtualbox.org/virtualbox/${version}/SHA256SUMS # for hashes. - version = "5.0.20"; + version = "5.0.26"; forEachModule = action: '' for mod in \ @@ -39,12 +39,12 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "106931"; + extpackRevision = "108824"; extensionPack = requireFile rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; # IMPORTANT: Hash must be base16 encoded because it's used as an input to # VBoxExtPackHelperApp! - sha256 = "11f40842a56ebb17da1bbc82a21543e66108a5330ebd54ded68038a990aa071b"; + sha256 = "2f2302c7ba3d00a1258fe8e7767a6eb08dccdc3c31f6e3eeb74063c2c268b104"; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) available at: @@ -63,7 +63,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "0asc5n9an2dzvrd4isjz3vac2h0sm6dbzvrc36hn8ag2ma3hg75g"; + sha256 = "78dec1369d2c8feefea3c682d95e76c0e99414c56626388035cf4061d4dad62e"; }; buildInputs = @@ -97,14 +97,7 @@ in stdenv.mkDerivation { set +x ''; - patches = optional enableHardening ./hardened.patch - ++ [ - (fetchurl rec { - name = "fix-detect-gcc-5.4.patch"; - url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=827193;filename=${name};msg=5"; - sha256 = "0y6v5dc6fqj9iv27cl8q2g87v1kxg19129mpas4vjg7g0529v4g9"; - }) - ]; + patches = optional enableHardening ./hardened.patch; postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index c0183fc7af71..1cd99b62436a 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "1rh1dw0fqz1zhdbpnwxclh1bfj889xh27dm2m23v5wg54bymkfvg"; + sha256 = "7458ee5a7121a7d243fd6a7528ba427945d9120c5efc7cd75b3951fb01f09c59"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; |