commit 444987193e47aad56f7e78684a11f8ded3b830a5 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/installer/tools/nixos-generate-config.pl

···

       235
       235
        
       # Check if we're a VirtualBox guest.  If so, enable the guest

     

       236
       236
        
       # additions.

     

       237
       237
        
       if ($virt eq "oracle") {

     

       238
       238
       -
           push @attrs, "services.virtualbox.enable = true;"

     

       238
       238
       +
           push @attrs, "services.virtualboxGuest.enable = true;"

     

       239
       239
        
       }

     

       240
       240
        
       

     

       241
       241

+3

nixos/modules/rename.nix

···

       107
       107
        
       ++ obsolete [ "services" "xserver" "startOpenSSHAgent" ] [ "programs" "ssh" "startAgent" ]

     

       108
       108
        
       ++ obsolete [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "xbmc" ]

     

       109
       109
        
       

     

       110
       110
       +
       # VirtualBox

     

       111
       111
       +
       ++ obsolete [ "services" "virtualbox" "enable" ] [ "services" "virtualboxGuest" "enable" ]

     

       112
       112
       +
       

     

       110
       113
        
       # KDE

     

       111
       114
        
       ++ deprecated [ "kde" "extraPackages" ] [ "environment" "kdePackages" ]

     

       112
       115
        
       # ++ obsolete [ "environment" "kdePackages" ] [ "environment" "systemPackages" ] # !!! doesn't work!

+2 -2

nixos/modules/virtualisation/virtualbox-guest.nix

···

       6
       6
        
       

     

       7
       7
        
       let

     

       8
       8
        
       

     

       9
       9
       -
         cfg = config.services.virtualbox;

     

       9
       9
       +
         cfg = config.services.virtualboxGuest;

     

       10
       10
        
         kernel = config.boot.kernelPackages;

     

       11
       11
        
       

     

       12
       12
        
       in

     
···

       17
       17
        
       

     

       18
       18
        
         options = {

     

       19
       19
        
       

     

       20
       20
       -
           services.virtualbox = {

     

       20
       20
       +
           services.virtualboxGuest = {

     

       21
       21
        
       

     

       22
       22
        
             enable = mkOption {

     

       23
       23
        
               default = false;

+1 -1

nixos/modules/virtualisation/virtualbox-image.nix

···

       128
       128
        
           boot.loader.grub.version = 2;

     

       129
       129
        
           boot.loader.grub.device = "/dev/sda";

     

       130
       130
        
         

     

       131
       131
       -
           services.virtualbox.enable = true;

     

       131
       131
       +
           services.virtualboxGuest.enable = true;

     

       132
       132
        
         };

     

       133
       133
        
       }

+1 -1

pkgs/build-support/grsecurity/default.nix

···

       84
       84
        
             let boolToKernOpt = b: if b then "y" else "n";

     

       85
       85
        
                 # Disable RANDSTRUCT under virtualbox, as it has some kind of

     

       86
       86
        
                 # breakage with the vbox guest drivers

     

       87
       87
       -
                 #randstruct = optionalString config.services.virtualbox.enable

     

       87
       87
       +
                 #randstruct = optionalString config.services.virtualboxGuest.enable

     

       88
       88
        
                 #  "GRKERNSEC_RANDSTRUCT n";

     

       89
       89
        
       

     

       90
       90
        
                 # Disable restricting links under the testing kernel, as something