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
base: bc94dcf50028
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: b93d3473d3e2
Choose a head ref
  • 2 commits
  • 14 files changed
  • 2 contributors

Commits on May 9, 2019

  1. virtualbox: 5.2.28 -> 6.0.6

    Quite some fixing was needed to get this to work.
    
    Changes in VirtualBox and additions:
    
    - VirtualBox is no longer officially supported on 32-bit hosts so i686-linux is removed from platforms
      for VirtualBox and the extension pack. 32-bit additions still work.
    
    - There was a refactoring of kernel module makefiles and two resulting bugs affected us which had to be patched.
      These bugs were reported to the bug tracker (see comments near patches).
    
    - The Qt5X11Extras makefile patch broke. Fixed it to apply again, making the libraries logic simpler
      and more correct (it just uses a different base path instead of always linking to Qt5X11Extras).
    
    - Added a patch to remove "test1" and "test2" kernel messages due to forgotten debugging code.
    
    - virtualbox-host NixOS module: the VirtualBoxVM executable should be setuid not VirtualBox.
      This matches how the official installer sets it up.
    
    - Additions: replaced a for loop for installing kernel modules with just a "make install",
      which seems to work without any of the things done in the previous code.
    
    - Additions: The package defined buildCommand which resulted in phases not running, including RUNPATH
      stripping in fixupPhase, and installPhase was defined which was not even run. Fixed this by
      refactoring using phases. Had to set dontStrip otherwise binaries were broken by stripping.
      The libdbus path had to be added later in fixupPhase because it is used via dlopen not directly linked.
    
    - Additions: Added zlib and libc to patchelf, otherwise runtime library errors result from some binaries.
      For some reason the missing libc only manifested itself for mount.vboxsf when included in the initrd.
    
    Changes in nixos/tests/virtualbox:
    
    - Update the simple-gui test to send the right keys to start the VM. With VirtualBox 5
      it was enough to just send "return", but with 6 the Tools thing may be selected by
      default. Send "home" to reliably select Tools, "down" to move to the VM and "return"
      to start it.
    
    - Disable the VirtualBox UART by default because it causes a crash due to a regression
      in VirtualBox (specific to software virtualization and serial port usage). It can
      still be enabled using an option but there is an assert that KVM nested virtualization
      is enabled, which works around the problem (see below).
    
    - Add an option to enable nested KVM virtualization, allowing VirtualBox to use hardware
      virtualization. This works around the UART problem and also allows using 64-bit
      guests, but requires a kernel module parameter.
    
    - Add an option to run 64-bit guests. Tested that the tests pass with that. As mentioned
      this requires KVM nested virtualization.
    ambrop72 committed May 9, 2019
    Copy the full SHA
    5bec9dc View commit details
    Browse the repository at this point in the history

Commits on May 10, 2019

  1. virtualbox: 5.2.28 -> 6.0.6 (#60943)

    virtualbox: 5.2.28 -> 6.0.6
    flokli committed May 10, 2019
    Copy the full SHA
    b93d347 View commit details
    Browse the repository at this point in the history