···

       
94
       
94
       
 
       


     

       
95
       
95
       
 
       
<listitem>

     

       
96
       
96
       
 
       
  <para>

     

       
97
       
97
       
+
       
    The VirtualBox host and guest options have been moved/renamed more

     

       
98
       
98
       
+
       
    consistently and less confusing to be now found in

     

       
99
       
99
       
+
       
    <literal>virtualisation.virtualbox.host.*</literal> instead of

     

       
100
       
100
       
+
       
    <literal>services.virtualboxHost.*</literal> and

     

       
101
       
101
       
+
       
    <literal>virtualisation.virtualbox.guest.*</literal> instead of

     

       
102
       
102
       
+
       
    <literal>services.virtualboxGuest.*</literal>.

     

       
103
       
103
       
+
       
  </para>

     

       
104
       
104
       
+
       
</listitem>

     

       
105
       
105
       
+
       


     

       
106
       
106
       
+
       
<listitem>

     

       
107
       
107
       
+
       
  <para>

     

       
97
       
108
       
 
       
    Haskell packages can no longer be found by name, i.e. the commands

     

       
98
       
109
       
 
       
    <literal>nix-env -qa cabal-install</literal> and <literal>nix-env -i

     

       
99
       
110
       
 
       
    ghc</literal> will fail, even though we <emphasis>do</emphasis> ship

     

···

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

     

       
110
       
110
       
 
       


     

       
111
       
111
       
 
       
# VirtualBox

     

       
112
       
112
       
-
       
++ obsolete [ "services" "virtualbox" "enable" ] [ "services" "virtualboxGuest" "enable" ]

     

       
112
       
112
       
+
       
++ obsolete [ "services" "virtualbox" "enable" ] [ "virtualisation" "virtualbox" "guest" "enable" ]

     

       
113
       
113
       
+
       
++ obsolete [ "services" "virtualboxGuest" "enable" ] [ "virtualisation" "virtualbox" "guest" "enable" ]

     

       
114
       
114
       
+
       
++ obsolete [ "programs" "virtualbox" "enable" ] [ "virtualisation" "virtualbox" "host" "enable" ]

     

       
115
       
115
       
+
       
++ obsolete [ "programs" "virtualbox" "addNetworkInterface" ] [ "virtualisation" "virtualbox" "host" "addNetworkInterface" ]

     

       
116
       
116
       
+
       
++ obsolete [ "programs" "virtualbox" "enableHardening" ] [ "virtualisation" "virtualbox" "host" "enableHardening" ]

     

       
117
       
117
       
+
       
++ obsolete [ "services" "virtualboxHost" "enable" ] [ "virtualisation" "virtualbox" "host" "enable" ]

     

       
118
       
118
       
+
       
++ obsolete [ "services" "virtualboxHost" "addNetworkInterface" ] [ "virtualisation" "virtualbox" "host" "addNetworkInterface" ]

     

       
119
       
119
       
+
       
++ obsolete [ "services" "virtualboxHost" "enableHardening" ] [ "virtualisation" "virtualbox" "host" "enableHardening" ]

     

       
113
       
120
       
 
       


     

       
114
       
121
       
 
       
# Tarsnap

     

       
115
       
122
       
 
       
++ obsolete [ "services" "tarsnap" "config" ] [ "services" "tarsnap" "archives" ]

     
···

       
143
       
150
       
 
       


     

       
144
       
151
       
 
       
# DNSCrypt-proxy

     

       
145
       
152
       
 
       
++ obsolete [ "services" "dnscrypt-proxy" "port" ] [ "services" "dnscrypt-proxy" "localPort" ]

     

       
146
       
146
       
-
       


     

       
147
       
147
       
-
       
++ obsolete [ "services" "virtualboxHost" ] [ "programs" "virtualbox" ]

     

       
148
       
153
       
 
       


     

       
149
       
154
       
 
       
# Options that are obsolete and have no replacement.

     

       
150
       
155
       
 
       
++ obsolete' [ "boot" "loader" "grub" "bootDevice" ]

     

···

       
6
       
6
       
 
       


     

       
7
       
7
       
 
       
let

     

       
8
       
8
       
 
       


     

       
9
       
9
       
-
       
  cfg = config.services.virtualboxGuest;

     

       
9
       
9
       
+
       
  cfg = config.virtualisation.virtualbox.guest;

     

       
10
       
10
       
 
       
  kernel = config.boot.kernelPackages;

     

       
11
       
11
       
 
       


     

       
12
       
12
       
 
       
in

     
···

       
15
       
15
       
 
       


     

       
16
       
16
       
 
       
  ###### interface

     

       
17
       
17
       
 
       


     

       
18
       
18
       
-
       
  options = {

     

       
19
       
19
       
-
       


     

       
20
       
20
       
-
       
    services.virtualboxGuest = {

     

       
21
       
21
       
-
       


     

       
22
       
22
       
-
       
      enable = mkOption {

     

       
23
       
23
       
-
       
        default = false;

     

       
24
       
24
       
-
       
        description = "Whether to enable the VirtualBox service and other guest additions.";

     

       
25
       
25
       
-
       
      };

     

       
26
       
26
       
-
       


     

       
27
       
27
       
-
       
    };

     

       
28
       
28
       
-
       


     

       
18
       
18
       
+
       
  options.virtualisation.virtualbox.guest.enable = mkOption {

     

       
19
       
19
       
+
       
    default = false;

     

       
20
       
20
       
+
       
    description = "Whether to enable the VirtualBox service and other guest additions.";

     

       
29
       
21
       
 
       
  };

     

       
30
       
30
       
-
       


     

       
31
       
22
       
 
       


     

       
32
       
23
       
 
       
  ###### implementation

     

       
33
       
24
       
 
       


     

···

       
3
       
3
       
 
       
with lib;

     

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
let

     

       
6
       
6
       
-
       
  cfg = config.programs.virtualbox;

     

       
6
       
6
       
+
       
  cfg = config.virtualisation.virtualbox.host;

     

       
7
       
7
       
 
       
  virtualbox = config.boot.kernelPackages.virtualbox.override {

     

       
8
       
8
       
 
       
    inherit (cfg) enableHardening;

     

       
9
       
9
       
 
       
  };

     
···

       
11
       
11
       
 
       
in

     

       
12
       
12
       
 
       


     

       
13
       
13
       
 
       
{

     

       
14
       
14
       
-
       
  options.programs.virtualbox = {

     

       
14
       
14
       
+
       
  options.virtualisation.virtualbox.host = {

     

       
15
       
15
       
 
       
    enable = mkOption {

     

       
16
       
16
       
 
       
      type = types.bool;

     

       
17
       
17
       
 
       
      default = false;

     

···

       
31
       
31
       
 
       
      fsType = "vboxsf";

     

       
32
       
32
       
 
       
    };

     

       
33
       
33
       
 
       


     

       
34
       
34
       
-
       
    services.virtualboxGuest.enable = true;

     

       
34
       
34
       
+
       
    virtualisation.virtualbox.guest.enable = true;

     

       
35
       
35
       
 
       


     

       
36
       
36
       
 
       
    boot.initrd.kernelModules = [

     

       
37
       
37
       
 
       
      "af_packet" "vboxsf"

     
···

       
308
       
308
       
 
       
      vmConfigs = mapAttrsToList mkVMConf vboxVMs;

     

       
309
       
309
       
 
       
    in [ ./common/user-account.nix ./common/x11.nix ] ++ vmConfigs;

     

       
310
       
310
       
 
       
    virtualisation.memorySize = 768;

     

       
311
       
311
       
-
       
    services.virtualboxHost.enable = true;

     

       
311
       
311
       
+
       
    virtualisation.virtualbox.host.enable = true;

     

       
312
       
312
       
 
       
    users.extraUsers.alice.extraGroups = let

     

       
313
       
313
       
-
       
      inherit (config.services.virtualboxHost) enableHardening;

     

       
313
       
313
       
+
       
      inherit (config.virtualisation.virtualbox.host) enableHardening;

     

       
314
       
314
       
 
       
    in lib.mkIf enableHardening (lib.singleton "vboxusers");

     

       
315
       
315
       
 
       
  };

     

       
316
       
316