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: 55079328c219
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d5f7c6ed3c3e
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Jun 8, 2020

  1. virtualbox: 6.1.6 -> 6.1.10

    Niklas Thorne committed Jun 8, 2020
    Copy the full SHA
    081aa8f View commit details

Commits on Jul 21, 2020

  1. Merge pull request #89798 from nthorne/virtualbox6110 

    virtualbox: 6.1.6 -> 6.1.10
    @flokli
    flokli authored Jul 21, 2020
    Copy the full SHA
    d5f7c6e View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/virtualbox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ let
buildType = "release";
# Use maintainers/scripts/update.nix to update the version and all related hashes or
# change the hashes in extpack.nix and guest-additions/default.nix as well manually.
version = "6.1.6";
version = "6.1.10";

iasl' = iasl.overrideAttrs (old: rec {
inherit (old) pname;
@@ -40,7 +40,7 @@ in stdenv.mkDerivation {

src = fetchurl {
url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
sha256 = "b031c30d770f28c5f884071ad933e8c1f83e65b93aaba03a4012077c1d90a54f";
sha256 = "37d8b30c0be82a50c858f3fc70cde967882239b6212bb32e138d3615b423c477";
};

outputs = [ "out" "modsrc" ];
2 changes: 1 addition & 1 deletion pkgs/applications/virtualization/virtualbox/extpack.nix
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ fetchurl rec {
# Manually sha256sum the extensionPack file, must be hex!
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
# Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
let value = "80b96b4b51a502141f6a8981f1493ade08a00762622c39e48319e5b122119bf3";
let value = "03067f27f4da07c5d0fdafc56d27e3ea23a60682b333b2a1010fb74ef9a40c28";
in assert (builtins.stringLength value) == 64; value;

meta = {
2 changes: 1 addition & 1 deletion pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {

src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
sha256 = "bcde4691dea7de93b65a10a43dda2b8f52e570f820992ad281c9bb5c8dede181";
sha256 = "62a0c6715bee164817a6f58858dec1d60f01fd0ae00a377a75bbf885ddbd0a61";
};

KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";