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

Commits on Oct 9, 2019

  1. virtualbox: 6.0.10 -> 6.0.12

    @KamilaBorowska
    KamilaBorowska committed Oct 9, 2019
    Copy the full SHA
    8e2c34c View commit details

Commits on Oct 11, 2019

  1. Merge pull request #70881 from xfix/virtualbox-update 

    virtualbox: 6.0.10 -> 6.0.12
    @flokli
    flokli authored Oct 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fb5f649 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
@@ -21,8 +21,8 @@ let
buildType = "release";
# Remember to change the extpackRev and version in extpack.nix and
# guest-additions/default.nix as well.
main = "1y6j73axjns8ng3m8zs31zwx71wmm91n6vrhdpxphx16jf518djj";
version = "6.0.10";
main = "1hxbvr78b0fddcn7npz72ki89lpmbgqj4b5qvxm1wik7v0d8v1y8";
version = "6.0.12";
in stdenv.mkDerivation {
pname = "virtualbox";
inherit version;
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/virtualbox/extpack.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

with lib;

let version = "6.0.10";
let version = "6.0.12";
in
fetchurl rec {
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack";
@@ -11,7 +11,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 = "e5a9eb240379a57c9bf03954a594a03431698e67aef551e27f62170bed9b16ea";
let value = "27a0956940654b0accf4d79692078bd496d9f062e4ed3da69e5421cba8d1e444";
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
@@ -26,7 +26,7 @@ in stdenv.mkDerivation {

src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
sha256 = "098kibz8dkiqd8shm44n4h6iyszcbj0ikav1b4vsi75dqzw8d9n8";
sha256 = "0hflsbx70dli34mpx94vd33p55ycfs3ahzwcdzqxdiwiiskjpykq";
};

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