Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4e08459f9b98
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6fb9f892382b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 30, 2017

  1. virtualbox: 5.1.18 -> 5.1.22

    bachp committed Apr 30, 2017
    Copy the full SHA
    c4a4860 View commit details

Commits on Jun 23, 2017

  1. Merge pull request #25368 from bachp/virtualbox-5.1.22

    virtualbox: 5.1.18 -> 5.1.22
    NeQuissimus authored Jun 23, 2017
    Copy the full SHA
    6fb9f89 View commit details
Showing with 6 additions and 7 deletions.
  1. +4 −5 pkgs/applications/virtualization/virtualbox/default.nix
  2. +2 −2 pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
9 changes: 4 additions & 5 deletions pkgs/applications/virtualization/virtualbox/default.nix
Original file line number Diff line number Diff line change
@@ -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 {
Original file line number Diff line number Diff line change
@@ -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.