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: 2be82fd06eac
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 37694c8cc0e9
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 8, 2019

  1. nixos/virtualbox: add warning when for ineffective nixpkgs config 

    nixpkgs.config.virtualbox.enableExtensionPack doesn't do anything, but
used to. Add a warning for the unsuspecting.

(cherry picked from commit 8b6a38c)
    @bendlas @infinisil
    bendlas authored and infinisil committed Mar 8, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    infinisil Silvan Mosberger
    GPG key ID: 9424360B4B85C9E7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    37694c8 View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 nixos/modules/virtualisation/virtualbox-host.nix
2 changes: 2 additions & 0 deletions nixos/modules/virtualisation/virtualbox-host.nix
View file
Original file line number Diff line number Diff line change
@@ -83,6 +83,8 @@ in
};

config = mkIf cfg.enable (mkMerge [{
warnings = mkIf (config.nixpkgs.config.virtualbox.enableExtensionPack or false)
"'nixpkgs.virtualbox.enableExtensionPack' has no effect, please use 'virtualisation.virtualbox.host.enableExtensionPack'";
boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ];
boot.extraModulePackages = [ kernelModules ];
environment.systemPackages = [ virtualbox ];