commit 88ca2b1ec4fcdadb48ed6084b2bf4cae58d6ccea · pyrox.dev/nixpkgs

+10 -5

nixos/doc/manual/administration/boot-problems.xml

···

       14
       14
        
         NixOS boot scripts or by systemd:

     

       15
       15
        
         <variablelist>

     

       16
       16
        
          <varlistentry>

     

       17
       17
       -
           <term><literal>boot.shell_on_fail</literal>

     

       17
       17
       +
           <term>

     

       18
       18
       +
            <literal>boot.shell_on_fail</literal>

     

       18
       19
        
           </term>

     

       19
       20
        
           <listitem>

     

       20
       21
        
            <para>

     
···

       25
       26
        
           </listitem>

     

       26
       27
        
          </varlistentry>

     

       27
       28
        
          <varlistentry>

     

       28
       28
       -
           <term><literal>boot.debug1</literal>

     

       29
       29
       +
           <term>

     

       30
       30
       +
            <literal>boot.debug1</literal>

     

       29
       31
        
           </term>

     

       30
       32
        
           <listitem>

     

       31
       33
        
            <para>

     
···

       37
       39
        
           </listitem>

     

       38
       40
        
          </varlistentry>

     

       39
       41
        
          <varlistentry>

     

       40
       40
       -
           <term><literal>boot.trace</literal>

     

       42
       42
       +
           <term>

     

       43
       43
       +
            <literal>boot.trace</literal>

     

       41
       44
        
           </term>

     

       42
       45
        
           <listitem>

     

       43
       46
        
            <para>

     
···

       46
       49
        
           </listitem>

     

       47
       50
        
          </varlistentry>

     

       48
       51
        
          <varlistentry>

     

       49
       49
       -
           <term><literal>single</literal>

     

       52
       52
       +
           <term>

     

       53
       53
       +
            <literal>single</literal>

     

       50
       54
        
           </term>

     

       51
       55
        
           <listitem>

     

       52
       56
        
            <para>

     
···

       59
       63
        
           </listitem>

     

       60
       64
        
          </varlistentry>

     

       61
       65
        
          <varlistentry>

     

       62
       62
       -
           <term><literal>systemd.log_level=debug systemd.log_target=console</literal>

     

       66
       66
       +
           <term>

     

       67
       67
       +
            <literal>systemd.log_level=debug systemd.log_target=console</literal>

     

       63
       68
        
           </term>

     

       64
       69
        
           <listitem>

     

       65
       70
        
            <para>

+18 -6

nixos/doc/manual/configuration/config-file.xml

···

       80
       80
        
         Options have various types of values. The most important are:

     

       81
       81
        
         <variablelist>

     

       82
       82
        
          <varlistentry>

     

       83
       83
       -
           <term>Strings</term>

     

       83
       83
       +
           <term>

     

       84
       84
       +
            Strings

     

       85
       85
       +
           </term>

     

       84
       86
        
           <listitem>

     

       85
       87
        
            <para>

     

       86
       88
        
             Strings are enclosed in double quotes, e.g.

     
···

       112
       114
        
           </listitem>

     

       113
       115
        
          </varlistentry>

     

       114
       116
        
          <varlistentry>

     

       115
       115
       -
           <term>Booleans</term>

     

       117
       117
       +
           <term>

     

       118
       118
       +
            Booleans

     

       119
       119
       +
           </term>

     

       116
       120
        
           <listitem>

     

       117
       121
        
            <para>

     

       118
       122
        
             These can be <literal>true</literal> or <literal>false</literal>, e.g.

     
···

       124
       128
        
           </listitem>

     

       125
       129
        
          </varlistentry>

     

       126
       130
        
          <varlistentry>

     

       127
       127
       -
           <term>Integers</term>

     

       131
       131
       +
           <term>

     

       132
       132
       +
            Integers

     

       133
       133
       +
           </term>

     

       128
       134
        
           <listitem>

     

       129
       135
        
            <para>

     

       130
       136
        
             For example,

     
···

       141
       147
        
           </listitem>

     

       142
       148
        
          </varlistentry>

     

       143
       149
        
          <varlistentry>

     

       144
       144
       -
           <term>Sets</term>

     

       150
       150
       +
           <term>

     

       151
       151
       +
            Sets

     

       152
       152
       +
           </term>

     

       145
       153
        
           <listitem>

     

       146
       154
        
            <para>

     

       147
       155
        
             Sets were introduced above. They are name/value pairs enclosed in braces,

     
···

       157
       165
        
           </listitem>

     

       158
       166
        
          </varlistentry>

     

       159
       167
        
          <varlistentry>

     

       160
       160
       -
           <term>Lists</term>

     

       168
       168
       +
           <term>

     

       169
       169
       +
            Lists

     

       170
       170
       +
           </term>

     

       161
       171
        
           <listitem>

     

       162
       172
        
            <para>

     

       163
       173
        
             The important thing to note about lists is that list elements are

     
···

       173
       183
        
           </listitem>

     

       174
       184
        
          </varlistentry>

     

       175
       185
        
          <varlistentry>

     

       176
       176
       -
           <term>Packages</term>

     

       186
       186
       +
           <term>

     

       187
       187
       +
            Packages

     

       188
       188
       +
           </term>

     

       177
       189
        
           <listitem>

     

       178
       190
        
            <para>

     

       179
       191
        
             Usually, the packages you need are already part of the Nix Packages

+18 -9

nixos/doc/manual/development/building-parts.xml

···

       15
       15
        
         include:

     

       16
       16
        
         <variablelist>

     

       17
       17
        
          <varlistentry>

     

       18
       18
       -
           <term><varname>system.build.toplevel</varname>

     

       18
       18
       +
           <term>

     

       19
       19
       +
            <varname>system.build.toplevel</varname>

     

       19
       20
        
           </term>

     

       20
       21
        
           <listitem>

     

       21
       22
        
            <para>

     
···

       32
       33
        
           </listitem>

     

       33
       34
        
          </varlistentry>

     

       34
       35
        
          <varlistentry>

     

       35
       35
       -
           <term><varname>system.build.manual.manual</varname>

     

       36
       36
       +
           <term>

     

       37
       37
       +
            <varname>system.build.manual.manual</varname>

     

       36
       38
        
           </term>

     

       37
       39
        
           <listitem>

     

       38
       40
        
            <para>

     
···

       41
       43
        
           </listitem>

     

       42
       44
        
          </varlistentry>

     

       43
       45
        
          <varlistentry>

     

       44
       44
       -
           <term><varname>system.build.etc</varname>

     

       46
       46
       +
           <term>

     

       47
       47
       +
            <varname>system.build.etc</varname>

     

       45
       48
        
           </term>

     

       46
       49
        
           <listitem>

     

       47
       50
        
            <para>

     
···

       51
       54
        
           </listitem>

     

       52
       55
        
          </varlistentry>

     

       53
       56
        
          <varlistentry>

     

       54
       54
       -
           <term><varname>system.build.initialRamdisk</varname>

     

       57
       57
       +
           <term>

     

       58
       58
       +
            <varname>system.build.initialRamdisk</varname>

     

       55
       59
        
           </term>

     

       56
       56
       -
           <term><varname>system.build.kernel</varname>

     

       60
       60
       +
           <term>

     

       61
       61
       +
            <varname>system.build.kernel</varname>

     

       57
       62
        
           </term>

     

       58
       63
        
           <listitem>

     

       59
       64
        
            <para>

     
···

       69
       74
        
           </listitem>

     

       70
       75
        
          </varlistentry>

     

       71
       76
        
          <varlistentry>

     

       72
       72
       -
           <term><varname>system.build.nixos-rebuild</varname>

     

       77
       77
       +
           <term>

     

       78
       78
       +
            <varname>system.build.nixos-rebuild</varname>

     

       73
       79
        
           </term>

     

       74
       74
       -
           <term><varname>system.build.nixos-install</varname>

     

       80
       80
       +
           <term>

     

       81
       81
       +
            <varname>system.build.nixos-install</varname>

     

       75
       82
        
           </term>

     

       76
       76
       -
           <term><varname>system.build.nixos-generate-config</varname>

     

       83
       83
       +
           <term>

     

       84
       84
       +
            <varname>system.build.nixos-generate-config</varname>

     

       77
       85
        
           </term>

     

       78
       86
        
           <listitem>

     

       79
       87
        
            <para>

     
···

       82
       90
        
           </listitem>

     

       83
       91
        
          </varlistentry>

     

       84
       92
        
          <varlistentry>

     

       85
       85
       -
           <term><varname>systemd.units.<replaceable>unit-name</replaceable>.unit</varname>

     

       93
       93
       +
           <term>

     

       94
       94
       +
            <varname>systemd.units.<replaceable>unit-name</replaceable>.unit</varname>

     

       86
       95
        
           </term>

     

       87
       96
        
           <listitem>

     

       88
       97
        
            <para>

+8 -4

nixos/doc/manual/development/option-declarations.xml

···

       32
       32
        
         The function <varname>mkOption</varname> accepts the following arguments.

     

       33
       33
        
         <variablelist>

     

       34
       34
        
          <varlistentry>

     

       35
       35
       -
           <term><varname>type</varname>

     

       35
       35
       +
           <term>

     

       36
       36
       +
            <varname>type</varname>

     

       36
       37
        
           </term>

     

       37
       38
        
           <listitem>

     

       38
       39
        
            <para>

     
···

       43
       44
        
           </listitem>

     

       44
       45
        
          </varlistentry>

     

       45
       46
        
          <varlistentry>

     

       46
       46
       -
           <term><varname>default</varname>

     

       47
       47
       +
           <term>

     

       48
       48
       +
            <varname>default</varname>

     

       47
       49
        
           </term>

     

       48
       50
        
           <listitem>

     

       49
       51
        
            <para>

     
···

       55
       57
        
           </listitem>

     

       56
       58
        
          </varlistentry>

     

       57
       59
        
          <varlistentry>

     

       58
       58
       -
           <term><varname>example</varname>

     

       60
       60
       +
           <term>

     

       61
       61
       +
            <varname>example</varname>

     

       59
       62
        
           </term>

     

       60
       63
        
           <listitem>

     

       61
       64
        
            <para>

     
···

       64
       67
        
           </listitem>

     

       65
       68
        
          </varlistentry>

     

       66
       69
        
          <varlistentry>

     

       67
       67
       -
           <term><varname>description</varname>

     

       70
       70
       +
           <term>

     

       71
       71
       +
            <varname>description</varname>

     

       68
       72
        
           </term>

     

       69
       73
        
           <listitem>

     

       70
       74
        
            <para>

+86 -43

nixos/doc/manual/development/option-types.xml

···

       22
       22
        
       

     

       23
       23
        
         <variablelist>

     

       24
       24
        
          <varlistentry>

     

       25
       25
       -
           <term><varname>types.attrs</varname>

     

       25
       25
       +
           <term>

     

       26
       26
       +
            <varname>types.attrs</varname>

     

       26
       27
        
           </term>

     

       27
       28
        
           <listitem>

     

       28
       29
        
            <para>

     
···

       31
       32
        
           </listitem>

     

       32
       33
        
          </varlistentry>

     

       33
       34
        
          <varlistentry>

     

       34
       34
       -
           <term><varname>types.bool</varname>

     

       35
       35
       +
           <term>

     

       36
       36
       +
            <varname>types.bool</varname>

     

       35
       37
        
           </term>

     

       36
       38
        
           <listitem>

     

       37
       39
        
            <para>

     
···

       41
       43
        
           </listitem>

     

       42
       44
        
          </varlistentry>

     

       43
       45
        
          <varlistentry>

     

       44
       44
       -
           <term><varname>types.path</varname>

     

       46
       46
       +
           <term>

     

       47
       47
       +
            <varname>types.path</varname>

     

       45
       48
        
           </term>

     

       46
       49
        
           <listitem>

     

       47
       50
        
            <para>

     
···

       52
       55
        
           </listitem>

     

       53
       56
        
          </varlistentry>

     

       54
       57
        
          <varlistentry>

     

       55
       55
       -
           <term><varname>types.package</varname>

     

       58
       58
       +
           <term>

     

       59
       59
       +
            <varname>types.package</varname>

     

       56
       60
        
           </term>

     

       57
       61
        
           <listitem>

     

       58
       62
        
            <para>

     
···

       68
       72
        
       

     

       69
       73
        
         <variablelist>

     

       70
       74
        
          <varlistentry>

     

       71
       71
       -
           <term><varname>types.int</varname>

     

       75
       75
       +
           <term>

     

       76
       76
       +
            <varname>types.int</varname>

     

       72
       77
        
           </term>

     

       73
       78
        
           <listitem>

     

       74
       79
        
            <para>

     
···

       77
       82
        
           </listitem>

     

       78
       83
        
          </varlistentry>

     

       79
       84
        
          <varlistentry>

     

       80
       80
       -
           <term><varname>types.ints.{s8, s16, s32}</varname>

     

       85
       85
       +
           <term>

     

       86
       86
       +
            <varname>types.ints.{s8, s16, s32}</varname>

     

       81
       87
        
           </term>

     

       82
       88
        
           <listitem>

     

       83
       89
        
            <para>

     
···

       91
       97
        
           </listitem>

     

       92
       98
        
          </varlistentry>

     

       93
       99
        
          <varlistentry>

     

       94
       94
       -
           <term><varname>types.ints.unsigned</varname>

     

       100
       100
       +
           <term>

     

       101
       101
       +
            <varname>types.ints.unsigned</varname>

     

       95
       102
        
           </term>

     

       96
       103
        
           <listitem>

     

       97
       104
        
            <para>

     
···

       100
       107
        
           </listitem>

     

       101
       108
        
          </varlistentry>

     

       102
       109
        
          <varlistentry>

     

       103
       103
       -
           <term><varname>types.ints.{u8, u16, u32}</varname>

     

       110
       110
       +
           <term>

     

       111
       111
       +
            <varname>types.ints.{u8, u16, u32}</varname>

     

       104
       112
        
           </term>

     

       105
       113
        
           <listitem>

     

       106
       114
        
            <para>

     
···

       114
       122
        
           </listitem>

     

       115
       123
        
          </varlistentry>

     

       116
       124
        
          <varlistentry>

     

       117
       117
       -
           <term><varname>types.ints.positive</varname>

     

       125
       125
       +
           <term>

     

       126
       126
       +
            <varname>types.ints.positive</varname>

     

       118
       127
        
           </term>

     

       119
       128
        
           <listitem>

     

       120
       129
        
            <para>

     
···

       130
       139
        
       

     

       131
       140
        
         <variablelist>

     

       132
       141
        
          <varlistentry>

     

       133
       133
       -
           <term><varname>types.str</varname>

     

       142
       142
       +
           <term>

     

       143
       143
       +
            <varname>types.str</varname>

     

       134
       144
        
           </term>

     

       135
       145
        
           <listitem>

     

       136
       146
        
            <para>

     
···

       139
       149
        
           </listitem>

     

       140
       150
        
          </varlistentry>

     

       141
       151
        
          <varlistentry>

     

       142
       142
       -
           <term><varname>types.lines</varname>

     

       152
       152
       +
           <term>

     

       153
       153
       +
            <varname>types.lines</varname>

     

       143
       154
        
           </term>

     

       144
       155
        
           <listitem>

     

       145
       156
        
            <para>

     
···

       149
       160
        
           </listitem>

     

       150
       161
        
          </varlistentry>

     

       151
       162
        
          <varlistentry>

     

       152
       152
       -
           <term><varname>types.commas</varname>

     

       163
       163
       +
           <term>

     

       164
       164
       +
            <varname>types.commas</varname>

     

       153
       165
        
           </term>

     

       154
       166
        
           <listitem>

     

       155
       167
        
            <para>

     
···

       159
       171
        
           </listitem>

     

       160
       172
        
          </varlistentry>

     

       161
       173
        
          <varlistentry>

     

       162
       162
       -
           <term><varname>types.envVar</varname>

     

       174
       174
       +
           <term>

     

       175
       175
       +
            <varname>types.envVar</varname>

     

       163
       176
        
           </term>

     

       164
       177
        
           <listitem>

     

       165
       178
        
            <para>

     
···

       169
       182
        
           </listitem>

     

       170
       183
        
          </varlistentry>

     

       171
       184
        
          <varlistentry>

     

       172
       172
       -
           <term><varname>types.strMatching</varname>

     

       185
       185
       +
           <term>

     

       186
       186
       +
            <varname>types.strMatching</varname>

     

       173
       187
        
           </term>

     

       174
       188
        
           <listitem>

     

       175
       189
        
            <para>

     
···

       191
       205
        
       

     

       192
       206
        
         <variablelist>

     

       193
       207
        
          <varlistentry>

     

       194
       194
       -
           <term><varname>types.enum</varname><replaceable>l</replaceable>

     

       208
       208
       +
           <term>

     

       209
       209
       +
            <varname>types.enum</varname><replaceable>l</replaceable>

     

       195
       210
        
           </term>

     

       196
       211
        
           <listitem>

     

       197
       212
        
            <para>

     
···

       202
       217
        
           </listitem>

     

       203
       218
        
          </varlistentry>

     

       204
       219
        
          <varlistentry>

     

       205
       205
       -
           <term><varname>types.separatedString</varname><replaceable>sep</replaceable>

     

       220
       220
       +
           <term>

     

       221
       221
       +
            <varname>types.separatedString</varname><replaceable>sep</replaceable>

     

       206
       222
        
           </term>

     

       207
       223
        
           <listitem>

     

       208
       224
        
            <para>

     
···

       212
       228
        
           </listitem>

     

       213
       229
        
          </varlistentry>

     

       214
       230
        
          <varlistentry>

     

       215
       215
       -
           <term><varname>types.ints.between</varname><replaceable>lowest</replaceable><replaceable>highest</replaceable>

     

       231
       231
       +
           <term>

     

       232
       232
       +
            <varname>types.ints.between</varname><replaceable>lowest</replaceable><replaceable>highest</replaceable>

     

       216
       233
        
           </term>

     

       217
       234
        
           <listitem>

     

       218
       235
        
            <para>

     
···

       223
       240
        
           </listitem>

     

       224
       241
        
          </varlistentry>

     

       225
       242
        
          <varlistentry>

     

       226
       226
       -
           <term><varname>types.submodule</varname><replaceable>o</replaceable>

     

       243
       243
       +
           <term>

     

       244
       244
       +
            <varname>types.submodule</varname><replaceable>o</replaceable>

     

       227
       245
        
           </term>

     

       228
       246
        
           <listitem>

     

       229
       247
        
            <para>

     
···

       250
       268
        
       

     

       251
       269
        
         <variablelist>

     

       252
       270
        
          <varlistentry>

     

       253
       253
       -
           <term><varname>types.listOf</varname><replaceable>t</replaceable>

     

       271
       271
       +
           <term>

     

       272
       272
       +
            <varname>types.listOf</varname><replaceable>t</replaceable>

     

       254
       273
        
           </term>

     

       255
       274
        
           <listitem>

     

       256
       275
        
            <para>

     
···

       260
       279
        
           </listitem>

     

       261
       280
        
          </varlistentry>

     

       262
       281
        
          <varlistentry>

     

       263
       263
       -
           <term><varname>types.attrsOf</varname><replaceable>t</replaceable>

     

       282
       282
       +
           <term>

     

       283
       283
       +
            <varname>types.attrsOf</varname><replaceable>t</replaceable>

     

       264
       284
        
           </term>

     

       265
       285
        
           <listitem>

     

       266
       286
        
            <para>

     
···

       271
       291
        
           </listitem>

     

       272
       292
        
          </varlistentry>

     

       273
       293
        
          <varlistentry>

     

       274
       274
       -
           <term><varname>types.loaOf</varname><replaceable>t</replaceable>

     

       294
       294
       +
           <term>

     

       295
       295
       +
            <varname>types.loaOf</varname><replaceable>t</replaceable>

     

       275
       296
        
           </term>

     

       276
       297
        
           <listitem>

     

       277
       298
        
            <para>

     
···

       281
       302
        
           </listitem>

     

       282
       303
        
          </varlistentry>

     

       283
       304
        
          <varlistentry>

     

       284
       284
       -
           <term><varname>types.nullOr</varname><replaceable>t</replaceable>

     

       305
       305
       +
           <term>

     

       306
       306
       +
            <varname>types.nullOr</varname><replaceable>t</replaceable>

     

       285
       307
        
           </term>

     

       286
       308
        
           <listitem>

     

       287
       309
        
            <para>

     
···

       291
       313
        
           </listitem>

     

       292
       314
        
          </varlistentry>

     

       293
       315
        
          <varlistentry>

     

       294
       294
       -
           <term><varname>types.uniq</varname><replaceable>t</replaceable>

     

       316
       316
       +
           <term>

     

       317
       317
       +
            <varname>types.uniq</varname><replaceable>t</replaceable>

     

       295
       318
        
           </term>

     

       296
       319
        
           <listitem>

     

       297
       320
        
            <para>

     
···

       301
       324
        
           </listitem>

     

       302
       325
        
          </varlistentry>

     

       303
       326
        
          <varlistentry>

     

       304
       304
       -
           <term><varname>types.either</varname><replaceable>t1</replaceable><replaceable>t2</replaceable>

     

       327
       327
       +
           <term>

     

       328
       328
       +
            <varname>types.either</varname><replaceable>t1</replaceable><replaceable>t2</replaceable>

     

       305
       329
        
           </term>

     

       306
       330
        
           <listitem>

     

       307
       331
        
            <para>

     
···

       312
       336
        
           </listitem>

     

       313
       337
        
          </varlistentry>

     

       314
       338
        
          <varlistentry>

     

       315
       315
       -
           <term><varname>types.coercedTo</varname><replaceable>from</replaceable><replaceable>f</replaceable><replaceable>to</replaceable>

     

       339
       339
       +
           <term>

     

       340
       340
       +
            <varname>types.coercedTo</varname><replaceable>from</replaceable><replaceable>f</replaceable><replaceable>to</replaceable>

     

       316
       341
        
           </term>

     

       317
       342
        
           <listitem>

     

       318
       343
        
            <para>

     
···

       468
       493
        
       

     

       469
       494
        
         <variablelist>

     

       470
       495
        
          <varlistentry>

     

       471
       471
       -
           <term><varname>check</varname>

     

       496
       496
       +
           <term>

     

       497
       497
       +
            <varname>check</varname>

     

       472
       498
        
           </term>

     

       473
       499
        
           <listitem>

     

       474
       500
        
            <para>

     
···

       501
       527
        
           </listitem>

     

       502
       528
        
          </varlistentry>

     

       503
       529
        
          <varlistentry>

     

       504
       504
       -
           <term><varname>merge</varname>

     

       530
       530
       +
           <term>

     

       531
       531
       +
            <varname>merge</varname>

     

       505
       532
        
           </term>

     

       506
       533
        
           <listitem>

     

       507
       534
        
            <para>

     
···

       534
       561
        
       

     

       535
       562
        
         <variablelist>

     

       536
       563
        
          <varlistentry>

     

       537
       537
       -
           <term><varname>name</varname>

     

       564
       564
       +
           <term>

     

       565
       565
       +
            <varname>name</varname>

     

       538
       566
        
           </term>

     

       539
       567
        
           <listitem>

     

       540
       568
        
            <para>

     
···

       543
       571
        
           </listitem>

     

       544
       572
        
          </varlistentry>

     

       545
       573
        
          <varlistentry>

     

       546
       546
       -
           <term><varname>definition</varname>

     

       574
       574
       +
           <term>

     

       575
       575
       +
            <varname>definition</varname>

     

       547
       576
        
           </term>

     

       548
       577
        
           <listitem>

     

       549
       578
        
            <para>

     
···

       553
       582
        
           </listitem>

     

       554
       583
        
          </varlistentry>

     

       555
       584
        
          <varlistentry>

     

       556
       556
       -
           <term><varname>check</varname>

     

       585
       585
       +
           <term>

     

       586
       586
       +
            <varname>check</varname>

     

       557
       587
        
           </term>

     

       558
       588
        
           <listitem>

     

       559
       589
        
            <para>

     
···

       565
       595
        
           </listitem>

     

       566
       596
        
          </varlistentry>

     

       567
       597
        
          <varlistentry>

     

       568
       568
       -
           <term><varname>merge</varname>

     

       598
       598
       +
           <term>

     

       599
       599
       +
            <varname>merge</varname>

     

       569
       600
        
           </term>

     

       570
       601
        
           <listitem>

     

       571
       602
        
            <para>

     
···

       573
       604
        
            </para>

     

       574
       605
        
            <variablelist>

     

       575
       606
        
             <varlistentry>

     

       576
       576
       -
              <term><replaceable>loc</replaceable>

     

       607
       607
       +
              <term>

     

       608
       608
       +
               <replaceable>loc</replaceable>

     

       577
       609
        
              </term>

     

       578
       610
        
              <listitem>

     

       579
       611
        
               <para>

     
···

       583
       615
        
              </listitem>

     

       584
       616
        
             </varlistentry>

     

       585
       617
        
             <varlistentry>

     

       586
       586
       -
              <term><replaceable>defs</replaceable>

     

       618
       618
       +
              <term>

     

       619
       619
       +
               <replaceable>defs</replaceable>

     

       587
       620
        
              </term>

     

       588
       621
        
              <listitem>

     

       589
       622
        
               <para>

     
···

       600
       633
        
           </listitem>

     

       601
       634
        
          </varlistentry>

     

       602
       635
        
          <varlistentry>

     

       603
       603
       -
           <term><varname>getSubOptions</varname>

     

       636
       636
       +
           <term>

     

       637
       637
       +
            <varname>getSubOptions</varname>

     

       604
       638
        
           </term>

     

       605
       639
        
           <listitem>

     

       606
       640
        
            <para>

     
···

       615
       649
        
           </listitem>

     

       616
       650
        
          </varlistentry>

     

       617
       651
        
          <varlistentry>

     

       618
       618
       -
           <term><varname>getSubModules</varname>

     

       652
       652
       +
           <term>

     

       653
       653
       +
            <varname>getSubModules</varname>

     

       619
       654
        
           </term>

     

       620
       655
        
           <listitem>

     

       621
       656
        
            <para>

     
···

       628
       663
        
           </listitem>

     

       629
       664
        
          </varlistentry>

     

       630
       665
        
          <varlistentry>

     

       631
       631
       -
           <term><varname>substSubModules</varname>

     

       666
       666
       +
           <term>

     

       667
       667
       +
            <varname>substSubModules</varname>

     

       632
       668
        
           </term>

     

       633
       669
        
           <listitem>

     

       634
       670
        
            <para>

     
···

       644
       680
        
           </listitem>

     

       645
       681
        
          </varlistentry>

     

       646
       682
        
          <varlistentry>

     

       647
       647
       -
           <term><varname>typeMerge</varname>

     

       683
       683
       +
           <term>

     

       684
       684
       +
            <varname>typeMerge</varname>

     

       648
       685
        
           </term>

     

       649
       686
        
           <listitem>

     

       650
       687
        
            <para>

     
···

       654
       691
        
            </para>

     

       655
       692
        
            <variablelist>

     

       656
       693
        
             <varlistentry>

     

       657
       657
       -
              <term><replaceable>f</replaceable>

     

       694
       694
       +
              <term>

     

       695
       695
       +
               <replaceable>f</replaceable>

     

       658
       696
        
              </term>

     

       659
       697
        
              <listitem>

     

       660
       698
        
               <para>

     
···

       670
       708
        
           </listitem>

     

       671
       709
        
          </varlistentry>

     

       672
       710
        
          <varlistentry>

     

       673
       673
       -
           <term><varname>functor</varname>

     

       711
       711
       +
           <term>

     

       712
       712
       +
            <varname>functor</varname>

     

       674
       713
        
           </term>

     

       675
       714
        
           <listitem>

     

       676
       715
        
            <para>

     
···

       679
       718
        
            </para>

     

       680
       719
        
            <variablelist>

     

       681
       720
        
             <varlistentry>

     

       682
       682
       -
              <term><varname>type</varname>

     

       721
       721
       +
              <term>

     

       722
       722
       +
               <varname>type</varname>

     

       683
       723
        
              </term>

     

       684
       724
        
              <listitem>

     

       685
       725
        
               <para>

     
···

       688
       728
        
              </listitem>

     

       689
       729
        
             </varlistentry>

     

       690
       730
        
             <varlistentry>

     

       691
       691
       -
              <term><varname>wrapped</varname>

     

       731
       731
       +
              <term>

     

       732
       732
       +
               <varname>wrapped</varname>

     

       692
       733
        
              </term>

     

       693
       734
        
              <listitem>

     

       694
       735
        
               <para>

     
···

       697
       738
        
              </listitem>

     

       698
       739
        
             </varlistentry>

     

       699
       740
        
             <varlistentry>

     

       700
       700
       -
              <term><varname>payload</varname>

     

       741
       741
       +
              <term>

     

       742
       742
       +
               <varname>payload</varname>

     

       701
       743
        
              </term>

     

       702
       744
        
              <listitem>

     

       703
       745
        
               <para>

     
···

       709
       751
        
              </listitem>

     

       710
       752
        
             </varlistentry>

     

       711
       753
        
             <varlistentry>

     

       712
       712
       -
              <term><varname>binOp</varname>

     

       754
       754
       +
              <term>

     

       755
       755
       +
               <varname>binOp</varname>

     

       713
       756
        
              </term>

     

       714
       757
        
              <listitem>

     

       715
       758
        
               <para>

+54 -27

nixos/doc/manual/development/writing-nixos-tests.xml

···

       54
       54
        
       <!-- FIXME: would be nice to generate this automatically. -->

     

       55
       55
        
         <variablelist>

     

       56
       56
        
          <varlistentry>

     

       57
       57
       -
           <term><option>virtualisation.memorySize</option>

     

       57
       57
       +
           <term>

     

       58
       58
       +
            <option>virtualisation.memorySize</option>

     

       58
       59
        
           </term>

     

       59
       60
        
           <listitem>

     

       60
       61
        
            <para>

     
···

       63
       64
        
           </listitem>

     

       64
       65
        
          </varlistentry>

     

       65
       66
        
          <varlistentry>

     

       66
       66
       -
           <term><option>virtualisation.vlans</option>

     

       67
       67
       +
           <term>

     

       68
       68
       +
            <option>virtualisation.vlans</option>

     

       67
       69
        
           </term>

     

       68
       70
        
           <listitem>

     

       69
       71
        
            <para>

     
···

       75
       77
        
           </listitem>

     

       76
       78
        
          </varlistentry>

     

       77
       79
        
          <varlistentry>

     

       78
       78
       -
           <term><option>virtualisation.writableStore</option>

     

       80
       80
       +
           <term>

     

       81
       81
       +
            <option>virtualisation.writableStore</option>

     

       79
       82
        
           </term>

     

       80
       83
        
           <listitem>

     

       81
       84
        
            <para>

     
···

       120
       123
        
         The following methods are available on machine objects:

     

       121
       124
        
         <variablelist>

     

       122
       125
        
          <varlistentry>

     

       123
       123
       -
           <term><methodname>start</methodname>

     

       126
       126
       +
           <term>

     

       127
       127
       +
            <methodname>start</methodname>

     

       124
       128
        
           </term>

     

       125
       129
        
           <listitem>

     

       126
       130
        
            <para>

     
···

       130
       134
        
           </listitem>

     

       131
       135
        
          </varlistentry>

     

       132
       136
        
          <varlistentry>

     

       133
       133
       -
           <term><methodname>shutdown</methodname>

     

       137
       137
       +
           <term>

     

       138
       138
       +
            <methodname>shutdown</methodname>

     

       134
       139
        
           </term>

     

       135
       140
        
           <listitem>

     

       136
       141
        
            <para>

     
···

       139
       144
        
           </listitem>

     

       140
       145
        
          </varlistentry>

     

       141
       146
        
          <varlistentry>

     

       142
       142
       -
           <term><methodname>crash</methodname>

     

       147
       147
       +
           <term>

     

       148
       148
       +
            <methodname>crash</methodname>

     

       143
       149
        
           </term>

     

       144
       150
        
           <listitem>

     

       145
       151
        
            <para>

     
···

       148
       154
        
           </listitem>

     

       149
       155
        
          </varlistentry>

     

       150
       156
        
          <varlistentry>

     

       151
       151
       -
           <term><methodname>block</methodname>

     

       157
       157
       +
           <term>

     

       158
       158
       +
            <methodname>block</methodname>

     

       152
       159
        
           </term>

     

       153
       160
        
           <listitem>

     

       154
       161
        
            <para>

     
···

       158
       165
        
           </listitem>

     

       159
       166
        
          </varlistentry>

     

       160
       167
        
          <varlistentry>

     

       161
       161
       -
           <term><methodname>unblock</methodname>

     

       168
       168
       +
           <term>

     

       169
       169
       +
            <methodname>unblock</methodname>

     

       162
       170
        
           </term>

     

       163
       171
        
           <listitem>

     

       164
       172
        
            <para>

     
···

       167
       175
        
           </listitem>

     

       168
       176
        
          </varlistentry>

     

       169
       177
        
          <varlistentry>

     

       170
       170
       -
           <term><methodname>screenshot</methodname>

     

       178
       178
       +
           <term>

     

       179
       179
       +
            <methodname>screenshot</methodname>

     

       171
       180
        
           </term>

     

       172
       181
        
           <listitem>

     

       173
       182
        
            <para>

     
···

       177
       186
        
           </listitem>

     

       178
       187
        
          </varlistentry>

     

       179
       188
        
          <varlistentry>

     

       180
       180
       -
           <term><methodname>getScreenText</methodname>

     

       189
       189
       +
           <term>

     

       190
       190
       +
            <methodname>getScreenText</methodname>

     

       181
       191
        
           </term>

     

       182
       192
        
           <listitem>

     

       183
       193
        
            <para>

     
···

       193
       203
        
           </listitem>

     

       194
       204
        
          </varlistentry>

     

       195
       205
        
          <varlistentry>

     

       196
       196
       -
           <term><methodname>sendMonitorCommand</methodname>

     

       206
       206
       +
           <term>

     

       207
       207
       +
            <methodname>sendMonitorCommand</methodname>

     

       197
       208
        
           </term>

     

       198
       209
        
           <listitem>

     

       199
       210
        
            <para>

     
···

       203
       214
        
           </listitem>

     

       204
       215
        
          </varlistentry>

     

       205
       216
        
          <varlistentry>

     

       206
       206
       -
           <term><methodname>sendKeys</methodname>

     

       217
       217
       +
           <term>

     

       218
       218
       +
            <methodname>sendKeys</methodname>

     

       207
       219
        
           </term>

     

       208
       220
        
           <listitem>

     

       209
       221
        
            <para>

     
···

       213
       225
        
           </listitem>

     

       214
       226
        
          </varlistentry>

     

       215
       227
        
          <varlistentry>

     

       216
       216
       -
           <term><methodname>sendChars</methodname>

     

       228
       228
       +
           <term>

     

       229
       229
       +
            <methodname>sendChars</methodname>

     

       217
       230
        
           </term>

     

       218
       231
        
           <listitem>

     

       219
       232
        
            <para>

     
···

       224
       237
        
           </listitem>

     

       225
       238
        
          </varlistentry>

     

       226
       239
        
          <varlistentry>

     

       227
       227
       -
           <term><methodname>execute</methodname>

     

       240
       240
       +
           <term>

     

       241
       241
       +
            <methodname>execute</methodname>

     

       228
       242
        
           </term>

     

       229
       243
        
           <listitem>

     

       230
       244
        
            <para>

     
···

       235
       249
        
           </listitem>

     

       236
       250
        
          </varlistentry>

     

       237
       251
        
          <varlistentry>

     

       238
       238
       -
           <term><methodname>succeed</methodname>

     

       252
       252
       +
           <term>

     

       253
       253
       +
            <methodname>succeed</methodname>

     

       239
       254
        
           </term>

     

       240
       255
        
           <listitem>

     

       241
       256
        
            <para>

     
···

       245
       260
        
           </listitem>

     

       246
       261
        
          </varlistentry>

     

       247
       262
        
          <varlistentry>

     

       248
       248
       -
           <term><methodname>fail</methodname>

     

       263
       263
       +
           <term>

     

       264
       264
       +
            <methodname>fail</methodname>

     

       249
       265
        
           </term>

     

       250
       266
        
           <listitem>

     

       251
       267
        
            <para>

     
···

       255
       271
        
           </listitem>

     

       256
       272
        
          </varlistentry>

     

       257
       273
        
          <varlistentry>

     

       258
       258
       -
           <term><methodname>waitUntilSucceeds</methodname>

     

       274
       274
       +
           <term>

     

       275
       275
       +
            <methodname>waitUntilSucceeds</methodname>

     

       259
       276
        
           </term>

     

       260
       277
        
           <listitem>

     

       261
       278
        
            <para>

     
···

       264
       281
        
           </listitem>

     

       265
       282
        
          </varlistentry>

     

       266
       283
        
          <varlistentry>

     

       267
       267
       -
           <term><methodname>waitUntilFails</methodname>

     

       284
       284
       +
           <term>

     

       285
       285
       +
            <methodname>waitUntilFails</methodname>

     

       268
       286
        
           </term>

     

       269
       287
        
           <listitem>

     

       270
       288
        
            <para>

     
···

       273
       291
        
           </listitem>

     

       274
       292
        
          </varlistentry>

     

       275
       293
        
          <varlistentry>

     

       276
       276
       -
           <term><methodname>waitForUnit</methodname>

     

       294
       294
       +
           <term>

     

       295
       295
       +
            <methodname>waitForUnit</methodname>

     

       277
       296
        
           </term>

     

       278
       297
        
           <listitem>

     

       279
       298
        
            <para>

     
···

       282
       301
        
           </listitem>

     

       283
       302
        
          </varlistentry>

     

       284
       303
        
          <varlistentry>

     

       285
       285
       -
           <term><methodname>waitForFile</methodname>

     

       304
       304
       +
           <term>

     

       305
       305
       +
            <methodname>waitForFile</methodname>

     

       286
       306
        
           </term>

     

       287
       307
        
           <listitem>

     

       288
       308
        
            <para>

     
···

       291
       311
        
           </listitem>

     

       292
       312
        
          </varlistentry>

     

       293
       313
        
          <varlistentry>

     

       294
       294
       -
           <term><methodname>waitForOpenPort</methodname>

     

       314
       314
       +
           <term>

     

       315
       315
       +
            <methodname>waitForOpenPort</methodname>

     

       295
       316
        
           </term>

     

       296
       317
        
           <listitem>

     

       297
       318
        
            <para>

     
···

       301
       322
        
           </listitem>

     

       302
       323
        
          </varlistentry>

     

       303
       324
        
          <varlistentry>

     

       304
       304
       -
           <term><methodname>waitForClosedPort</methodname>

     

       325
       325
       +
           <term>

     

       326
       326
       +
            <methodname>waitForClosedPort</methodname>

     

       305
       327
        
           </term>

     

       306
       328
        
           <listitem>

     

       307
       329
        
            <para>

     
···

       310
       332
        
           </listitem>

     

       311
       333
        
          </varlistentry>

     

       312
       334
        
          <varlistentry>

     

       313
       313
       -
           <term><methodname>waitForX</methodname>

     

       335
       335
       +
           <term>

     

       336
       336
       +
            <methodname>waitForX</methodname>

     

       314
       337
        
           </term>

     

       315
       338
        
           <listitem>

     

       316
       339
        
            <para>

     
···

       319
       342
        
           </listitem>

     

       320
       343
        
          </varlistentry>

     

       321
       344
        
          <varlistentry>

     

       322
       322
       -
           <term><methodname>waitForText</methodname>

     

       345
       345
       +
           <term>

     

       346
       346
       +
            <methodname>waitForText</methodname>

     

       323
       347
        
           </term>

     

       324
       348
        
           <listitem>

     

       325
       349
        
            <para>

     
···

       336
       360
        
           </listitem>

     

       337
       361
        
          </varlistentry>

     

       338
       362
        
          <varlistentry>

     

       339
       339
       -
           <term><methodname>waitForWindow</methodname>

     

       363
       363
       +
           <term>

     

       364
       364
       +
            <methodname>waitForWindow</methodname>

     

       340
       365
        
           </term>

     

       341
       366
        
           <listitem>

     

       342
       367
        
            <para>

     
···

       346
       371
        
           </listitem>

     

       347
       372
        
          </varlistentry>

     

       348
       373
        
          <varlistentry>

     

       349
       349
       -
           <term><methodname>copyFileFromHost</methodname>

     

       374
       374
       +
           <term>

     

       375
       375
       +
            <methodname>copyFileFromHost</methodname>

     

       350
       376
        
           </term>

     

       351
       377
        
           <listitem>

     

       352
       378
        
            <para>

     
···

       361
       387
        
           </listitem>

     

       362
       388
        
          </varlistentry>

     

       363
       389
        
          <varlistentry>

     

       364
       364
       -
           <term><methodname>systemctl</methodname>

     

       390
       390
       +
           <term>

     

       391
       391
       +
            <methodname>systemctl</methodname>

     

       365
       392
        
           </term>

     

       366
       393
        
           <listitem>

     

       367
       394
        
            <para>

+15 -5

nixos/doc/manual/installation/installing.xml

···

       16
       16
        
          </para>

     

       17
       17
        
          <variablelist>

     

       18
       18
        
           <varlistentry>

     

       19
       19
       -
            <term>UEFI systems</term>

     

       19
       19
       +
            <term>

     

       20
       20
       +
             UEFI systems

     

       21
       21
       +
            </term>

     

       20
       22
        
            <listitem>

     

       21
       23
        
             <para>

     

       22
       24
        
              You should boot the live CD in UEFI mode (consult your specific

     
···

       138
       140
        
            <listitem>

     

       139
       141
        
             <variablelist>

     

       140
       142
        
              <varlistentry>

     

       141
       141
       -
               <term>UEFI systems</term>

     

       143
       143
       +
               <term>

     

       144
       144
       +
                UEFI systems

     

       145
       145
       +
               </term>

     

       142
       146
        
               <listitem>

     

       143
       147
        
                <para>

     

       144
       148
        
                 For creating boot partitions: <command>mkfs.fat</command>. Again

     
···

       178
       182
        
         <listitem>

     

       179
       183
        
          <variablelist>

     

       180
       184
        
           <varlistentry>

     

       181
       181
       -
            <term>UEFI systems</term>

     

       185
       185
       +
            <term>

     

       186
       186
       +
             UEFI systems

     

       187
       187
       +
            </term>

     

       182
       188
        
            <listitem>

     

       183
       189
        
             <para>

     

       184
       190
        
              Mount the boot file system on <filename>/mnt/boot</filename>, e.g.

     
···

       234
       240
        
          </para>

     

       235
       241
        
          <variablelist>

     

       236
       242
        
           <varlistentry>

     

       237
       237
       -
            <term>BIOS systems</term>

     

       243
       243
       +
            <term>

     

       244
       244
       +
             BIOS systems

     

       245
       245
       +
            </term>

     

       238
       246
        
            <listitem>

     

       239
       247
        
             <para>

     

       240
       248
        
              You <emphasis>must</emphasis> set the option

     
···

       244
       252
        
            </listitem>

     

       245
       253
        
           </varlistentry>

     

       246
       254
        
           <varlistentry>

     

       247
       247
       -
            <term>UEFI systems</term>

     

       255
       255
       +
            <term>

     

       256
       256
       +
             UEFI systems

     

       257
       257
       +
            </term>

     

       248
       258
        
            <listitem>

     

       249
       259
        
             <para>

     

       250
       260
        
              You <emphasis>must</emphasis> set the option

+19 -8

nixos/doc/manual/man-nixos-build-vms.xml

···

       12
       12
        
         </refname><refpurpose>build a network of virtual machines from a network of NixOS configurations</refpurpose>

     

       13
       13
        
        </refnamediv>

     

       14
       14
        
        <refsynopsisdiv>

     

       15
       15
       -
         <cmdsynopsis><command>nixos-build-vms</command>

     

       16
       16
       -
          <arg><option>--show-trace</option>

     

       15
       15
       +
         <cmdsynopsis>

     

       16
       16
       +
          <command>nixos-build-vms</command> 

     

       17
       17
       +
          <arg>

     

       18
       18
       +
           <option>--show-trace</option>

     

       17
       19
        
          </arg>

     

       18
       18
       -
          <arg><option>--no-out-link</option>

     

       20
       20
       +
           

     

       21
       21
       +
          <arg>

     

       22
       22
       +
           <option>--no-out-link</option>

     

       19
       23
        
          </arg>

     

       20
       20
       -
          <arg><option>--help</option>

     

       24
       24
       +
           

     

       25
       25
       +
          <arg>

     

       26
       26
       +
           <option>--help</option>

     

       21
       27
        
          </arg>

     

       22
       22
       -
          <arg choice="plain"><replaceable>network.nix</replaceable>

     

       28
       28
       +
           

     

       29
       29
       +
          <arg choice="plain">

     

       30
       30
       +
           <replaceable>network.nix</replaceable>

     

       23
       31
        
          </arg>

     

       24
       32
        
         </cmdsynopsis>

     

       25
       33
        
        </refsynopsisdiv>

     
···

       78
       86
        
         </para>

     

       79
       87
        
         <variablelist>

     

       80
       88
        
          <varlistentry>

     

       81
       81
       -
           <term><option>--show-trace</option>

     

       89
       89
       +
           <term>

     

       90
       90
       +
            <option>--show-trace</option>

     

       82
       91
        
           </term>

     

       83
       92
        
           <listitem>

     

       84
       93
        
            <para>

     
···

       87
       96
        
           </listitem>

     

       88
       97
        
          </varlistentry>

     

       89
       98
        
          <varlistentry>

     

       90
       90
       -
           <term><option>--no-out-link</option>

     

       99
       99
       +
           <term>

     

       100
       100
       +
            <option>--no-out-link</option>

     

       91
       101
        
           </term>

     

       92
       102
        
           <listitem>

     

       93
       103
        
            <para>

     
···

       96
       106
        
           </listitem>

     

       97
       107
        
          </varlistentry>

     

       98
       108
        
          <varlistentry>

     

       99
       99
       -
           <term><option>-h</option>, <option>--help</option>

     

       109
       109
       +
           <term>

     

       110
       110
       +
            <option>-h</option>, <option>--help</option>

     

       100
       111
        
           </term>

     

       101
       112
        
           <listitem>

     

       102
       113
        
            <para>

+34 -15

nixos/doc/manual/man-nixos-enter.xml

···

       12
       12
        
         </refname><refpurpose>run a command in a NixOS chroot environment</refpurpose>

     

       13
       13
        
        </refnamediv>

     

       14
       14
        
        <refsynopsisdiv>

     

       15
       15
       -
         <cmdsynopsis><command>nixos-enter</command>

     

       15
       15
       +
         <cmdsynopsis>

     

       16
       16
       +
          <command>nixos-enter</command> 

     

       16
       17
        
          <arg>

     

       17
       17
       -
           <arg choice='plain'><option>--root</option>

     

       18
       18
       -
           </arg><replaceable>root</replaceable>

     

       18
       18
       +
           <arg choice='plain'>

     

       19
       19
       +
            <option>--root</option>

     

       20
       20
       +
           </arg>

     

       21
       21
       +
            <replaceable>root</replaceable>

     

       19
       22
        
          </arg>

     

       23
       23
       +
           

     

       20
       24
        
          <arg>

     

       21
       21
       -
           <arg choice='plain'><option>--system</option>

     

       22
       22
       -
           </arg><replaceable>system</replaceable>

     

       25
       25
       +
           <arg choice='plain'>

     

       26
       26
       +
            <option>--system</option>

     

       27
       27
       +
           </arg>

     

       28
       28
       +
            <replaceable>system</replaceable>

     

       23
       29
        
          </arg>

     

       30
       30
       +
           

     

       24
       31
        
          <arg>

     

       25
       25
       -
           <arg choice='plain'><option>-c</option>

     

       26
       26
       -
           </arg><replaceable>shell-command</replaceable>

     

       32
       32
       +
           <arg choice='plain'>

     

       33
       33
       +
            <option>-c</option>

     

       34
       34
       +
           </arg>

     

       35
       35
       +
            <replaceable>shell-command</replaceable>

     

       27
       36
        
          </arg>

     

       37
       37
       +
           

     

       28
       38
        
          <arg>

     

       29
       29
       -
           <arg choice='plain'><option>--help</option>

     

       39
       39
       +
           <arg choice='plain'>

     

       40
       40
       +
            <option>--help</option>

     

       30
       41
        
           </arg>

     

       31
       42
        
          </arg>

     

       43
       43
       +
           

     

       32
       44
        
          <arg>

     

       33
       33
       -
           <arg choice='plain'><option>--</option>

     

       34
       34
       -
           </arg><replaceable>arguments</replaceable>

     

       45
       45
       +
           <arg choice='plain'>

     

       46
       46
       +
            <option>--</option>

     

       47
       47
       +
           </arg>

     

       48
       48
       +
            <replaceable>arguments</replaceable>

     

       35
       49
        
          </arg>

     

       36
       50
        
         </cmdsynopsis>

     

       37
       51
        
        </refsynopsisdiv>

     
···

       50
       64
        
         </para>

     

       51
       65
        
         <variablelist>

     

       52
       66
        
          <varlistentry>

     

       53
       53
       -
           <term><option>--root</option>

     

       67
       67
       +
           <term>

     

       68
       68
       +
            <option>--root</option>

     

       54
       69
        
           </term>

     

       55
       70
        
           <listitem>

     

       56
       71
        
            <para>

     
···

       60
       75
        
           </listitem>

     

       61
       76
        
          </varlistentry>

     

       62
       77
        
          <varlistentry>

     

       63
       63
       -
           <term><option>--system</option>

     

       78
       78
       +
           <term>

     

       79
       79
       +
            <option>--system</option>

     

       64
       80
        
           </term>

     

       65
       81
        
           <listitem>

     

       66
       82
        
            <para>

     
···

       72
       88
        
           </listitem>

     

       73
       89
        
          </varlistentry>

     

       74
       90
        
          <varlistentry>

     

       75
       75
       -
           <term><option>--command</option>

     

       91
       91
       +
           <term>

     

       92
       92
       +
            <option>--command</option>

     

       76
       93
        
           </term>

     

       77
       77
       -
           <term><option>-c</option>

     

       94
       94
       +
           <term>

     

       95
       95
       +
            <option>-c</option>

     

       78
       96
        
           </term>

     

       79
       97
        
           <listitem>

     

       80
       98
        
            <para>

     
···

       83
       101
        
           </listitem>

     

       84
       102
        
          </varlistentry>

     

       85
       103
        
          <varlistentry>

     

       86
       86
       -
           <term><option>--</option>

     

       104
       104
       +
           <term>

     

       105
       105
       +
            <option>--</option>

     

       87
       106
        
           </term>

     

       88
       107
        
           <listitem>

     

       89
       108
        
            <para>

+28 -13

nixos/doc/manual/man-nixos-generate-config.xml

···

       12
       12
        
         </refname><refpurpose>generate NixOS configuration modules</refpurpose>

     

       13
       13
        
        </refnamediv>

     

       14
       14
        
        <refsynopsisdiv>

     

       15
       15
       -
         <cmdsynopsis><command>nixos-generate-config</command>

     

       16
       16
       -
          <arg><option>--force</option>

     

       15
       15
       +
         <cmdsynopsis>

     

       16
       16
       +
          <command>nixos-generate-config</command> 

     

       17
       17
       +
          <arg>

     

       18
       18
       +
           <option>--force</option>

     

       17
       19
        
          </arg>

     

       20
       20
       +
           

     

       18
       21
        
          <arg>

     

       19
       19
       -
           <arg choice='plain'><option>--root</option>

     

       20
       20
       -
           </arg><replaceable>root</replaceable>

     

       22
       22
       +
           <arg choice='plain'>

     

       23
       23
       +
            <option>--root</option>

     

       24
       24
       +
           </arg>

     

       25
       25
       +
            <replaceable>root</replaceable>

     

       21
       26
        
          </arg>

     

       27
       27
       +
           

     

       22
       28
        
          <arg>

     

       23
       23
       -
           <arg choice='plain'><option>--dir</option>

     

       24
       24
       -
           </arg><replaceable>dir</replaceable>

     

       29
       29
       +
           <arg choice='plain'>

     

       30
       30
       +
            <option>--dir</option>

     

       31
       31
       +
           </arg>

     

       32
       32
       +
            <replaceable>dir</replaceable>

     

       25
       33
        
          </arg>

     

       26
       34
        
         </cmdsynopsis>

     

       27
       35
        
        </refsynopsisdiv>

     
···

       31
       39
        
          This command writes two NixOS configuration modules:

     

       32
       40
        
          <variablelist>

     

       33
       41
        
           <varlistentry>

     

       34
       34
       -
            <term><option>/etc/nixos/hardware-configuration.nix</option>

     

       42
       42
       +
            <term>

     

       43
       43
       +
             <option>/etc/nixos/hardware-configuration.nix</option>

     

       35
       44
        
            </term>

     

       36
       45
        
            <listitem>

     

       37
       46
        
             <para>

     
···

       53
       62
        
            </listitem>

     

       54
       63
        
           </varlistentry>

     

       55
       64
        
           <varlistentry>

     

       56
       56
       -
            <term><option>/etc/nixos/configuration.nix</option>

     

       65
       65
       +
            <term>

     

       66
       66
       +
             <option>/etc/nixos/configuration.nix</option>

     

       57
       67
        
            </term>

     

       58
       68
        
            <listitem>

     

       59
       69
        
             <para>

     
···

       74
       84
        
         </para>

     

       75
       85
        
         <variablelist>

     

       76
       86
        
          <varlistentry>

     

       77
       77
       -
           <term><option>--root</option>

     

       87
       87
       +
           <term>

     

       88
       88
       +
            <option>--root</option>

     

       78
       89
        
           </term>

     

       79
       90
        
           <listitem>

     

       80
       91
        
            <para>

     
···

       88
       99
        
           </listitem>

     

       89
       100
        
          </varlistentry>

     

       90
       101
        
          <varlistentry>

     

       91
       91
       -
           <term><option>--dir</option>

     

       102
       102
       +
           <term>

     

       103
       103
       +
            <option>--dir</option>

     

       92
       104
        
           </term>

     

       93
       105
        
           <listitem>

     

       94
       106
        
            <para>

     
···

       99
       111
        
           </listitem>

     

       100
       112
        
          </varlistentry>

     

       101
       113
        
          <varlistentry>

     

       102
       102
       -
           <term><option>--force</option>

     

       114
       114
       +
           <term>

     

       115
       115
       +
            <option>--force</option>

     

       103
       116
        
           </term>

     

       104
       117
        
           <listitem>

     

       105
       118
        
            <para>

     
···

       109
       122
        
           </listitem>

     

       110
       123
        
          </varlistentry>

     

       111
       124
        
          <varlistentry>

     

       112
       112
       -
           <term><option>--no-filesystems</option>

     

       125
       125
       +
           <term>

     

       126
       126
       +
            <option>--no-filesystems</option>

     

       113
       127
        
           </term>

     

       114
       128
        
           <listitem>

     

       115
       129
        
            <para>

     
···

       119
       133
        
           </listitem>

     

       120
       134
        
          </varlistentry>

     

       121
       135
        
          <varlistentry>

     

       122
       122
       -
           <term><option>--show-hardware-config</option>

     

       136
       136
       +
           <term>

     

       137
       137
       +
            <option>--show-hardware-config</option>

     

       123
       138
        
           </term>

     

       124
       139
        
           <listitem>

     

       125
       140
        
            <para>

+65 -27

nixos/doc/manual/man-nixos-install.xml

···

       12
       12
        
         </refname><refpurpose>install bootloader and NixOS</refpurpose>

     

       13
       13
        
        </refnamediv>

     

       14
       14
        
        <refsynopsisdiv>

     

       15
       15
       -
         <cmdsynopsis><command>nixos-install</command>

     

       15
       15
       +
         <cmdsynopsis>

     

       16
       16
       +
          <command>nixos-install</command> 

     

       16
       17
        
          <arg>

     

       17
       17
       -
           <arg choice='plain'><option>-I</option>

     

       18
       18
       -
           </arg><replaceable>path</replaceable>

     

       18
       18
       +
           <arg choice='plain'>

     

       19
       19
       +
            <option>-I</option>

     

       20
       20
       +
           </arg>

     

       21
       21
       +
            <replaceable>path</replaceable>

     

       19
       22
        
          </arg>

     

       23
       23
       +
           

     

       20
       24
        
          <arg>

     

       21
       21
       -
           <arg choice='plain'><option>--root</option>

     

       22
       22
       -
           </arg><replaceable>root</replaceable>

     

       25
       25
       +
           <arg choice='plain'>

     

       26
       26
       +
            <option>--root</option>

     

       27
       27
       +
           </arg>

     

       28
       28
       +
            <replaceable>root</replaceable>

     

       23
       29
        
          </arg>

     

       30
       30
       +
           

     

       24
       31
        
          <arg>

     

       25
       25
       -
           <arg choice='plain'><option>--system</option>

     

       26
       26
       -
           </arg><replaceable>path</replaceable>

     

       32
       32
       +
           <arg choice='plain'>

     

       33
       33
       +
            <option>--system</option>

     

       34
       34
       +
           </arg>

     

       35
       35
       +
            <replaceable>path</replaceable>

     

       27
       36
        
          </arg>

     

       37
       37
       +
           

     

       28
       38
        
          <arg>

     

       29
       29
       -
           <arg choice='plain'><option>--no-channel-copy</option>

     

       39
       39
       +
           <arg choice='plain'>

     

       40
       40
       +
            <option>--no-channel-copy</option>

     

       30
       41
        
           </arg>

     

       31
       42
        
          </arg>

     

       43
       43
       +
           

     

       32
       44
        
          <arg>

     

       33
       33
       -
           <arg choice='plain'><option>--no-root-passwd</option>

     

       45
       45
       +
           <arg choice='plain'>

     

       46
       46
       +
            <option>--no-root-passwd</option>

     

       34
       47
        
           </arg>

     

       35
       48
        
          </arg>

     

       49
       49
       +
           

     

       36
       50
        
          <arg>

     

       37
       37
       -
           <arg choice='plain'><option>--no-bootloader</option>

     

       51
       51
       +
           <arg choice='plain'>

     

       52
       52
       +
            <option>--no-bootloader</option>

     

       38
       53
        
           </arg>

     

       39
       54
        
          </arg>

     

       40
       40
       -
          <arg><group choice='req'>

     

       41
       41
       -
           <arg choice='plain'><option>--max-jobs</option>

     

       55
       55
       +
           

     

       56
       56
       +
          <arg>

     

       57
       57
       +
           <group choice='req'> 

     

       58
       58
       +
           <arg choice='plain'>

     

       59
       59
       +
            <option>--max-jobs</option>

     

       42
       60
        
           </arg>

     

       43
       43
       -
           <arg choice='plain'><option>-j</option>

     

       44
       44
       -
           </arg></group><replaceable>number</replaceable>

     

       61
       61
       +
            

     

       62
       62
       +
           <arg choice='plain'>

     

       63
       63
       +
            <option>-j</option>

     

       64
       64
       +
           </arg>

     

       65
       65
       +
            </group><replaceable>number</replaceable>

     

       45
       66
        
          </arg>

     

       46
       46
       -
          <arg><option>--cores</option><replaceable>number</replaceable>

     

       67
       67
       +
           

     

       68
       68
       +
          <arg>

     

       69
       69
       +
           <option>--cores</option><replaceable>number</replaceable>

     

       47
       70
        
          </arg>

     

       48
       48
       -
          <arg><option>--option</option><replaceable>name</replaceable><replaceable>value</replaceable>

     

       71
       71
       +
           

     

       72
       72
       +
          <arg>

     

       73
       73
       +
           <option>--option</option><replaceable>name</replaceable><replaceable>value</replaceable>

     

       49
       74
        
          </arg>

     

       75
       75
       +
           

     

       50
       76
        
          <arg>

     

       51
       51
       -
           <arg choice='plain'><option>--show-trace</option>

     

       77
       77
       +
           <arg choice='plain'>

     

       78
       78
       +
            <option>--show-trace</option>

     

       52
       79
        
           </arg>

     

       53
       80
        
          </arg>

     

       81
       81
       +
           

     

       54
       82
        
          <arg>

     

       55
       55
       -
           <arg choice='plain'><option>--help</option>

     

       83
       83
       +
           <arg choice='plain'>

     

       84
       84
       +
            <option>--help</option>

     

       56
       85
        
           </arg>

     

       57
       86
        
          </arg>

     

       58
       87
        
         </cmdsynopsis>

     
···

       106
       135
        
         </para>

     

       107
       136
        
         <variablelist>

     

       108
       137
        
          <varlistentry>

     

       109
       109
       -
           <term><option>--root</option>

     

       138
       138
       +
           <term>

     

       139
       139
       +
            <option>--root</option>

     

       110
       140
        
           </term>

     

       111
       141
        
           <listitem>

     

       112
       142
        
            <para>

     
···

       117
       147
        
           </listitem>

     

       118
       148
        
          </varlistentry>

     

       119
       149
        
          <varlistentry>

     

       120
       120
       -
           <term><option>--system</option>

     

       150
       150
       +
           <term>

     

       151
       151
       +
            <option>--system</option>

     

       121
       152
        
           </term>

     

       122
       153
        
           <listitem>

     

       123
       154
        
            <para>

     
···

       135
       166
        
           </listitem>

     

       136
       167
        
          </varlistentry>

     

       137
       168
        
          <varlistentry>

     

       138
       138
       -
           <term><option>-I</option>

     

       169
       169
       +
           <term>

     

       170
       170
       +
            <option>-I</option>

     

       139
       171
        
           </term>

     

       140
       172
        
           <listitem>

     

       141
       173
        
            <para>

     
···

       147
       179
        
           </listitem>

     

       148
       180
        
          </varlistentry>

     

       149
       181
        
          <varlistentry>

     

       150
       150
       -
           <term><option>--max-jobs</option>

     

       182
       182
       +
           <term>

     

       183
       183
       +
            <option>--max-jobs</option>

     

       151
       184
        
           </term>

     

       152
       152
       -
           <term><option>-j</option>

     

       185
       185
       +
           <term>

     

       186
       186
       +
            <option>-j</option>

     

       153
       187
        
           </term>

     

       154
       188
        
           <listitem>

     

       155
       189
        
            <para>

     
···

       160
       194
        
           </listitem>

     

       161
       195
        
          </varlistentry>

     

       162
       196
        
          <varlistentry>

     

       163
       163
       -
           <term><option>--cores</option>

     

       197
       197
       +
           <term>

     

       198
       198
       +
            <option>--cores</option>

     

       164
       199
        
           </term>

     

       165
       200
        
           <listitem>

     

       166
       201
        
            <para>

     
···

       177
       212
        
           </listitem>

     

       178
       213
        
          </varlistentry>

     

       179
       214
        
          <varlistentry>

     

       180
       180
       -
           <term><option>--option</option><replaceable>name</replaceable><replaceable>value</replaceable>

     

       215
       215
       +
           <term>

     

       216
       216
       +
            <option>--option</option><replaceable>name</replaceable><replaceable>value</replaceable>

     

       181
       217
        
           </term>

     

       182
       218
        
           <listitem>

     

       183
       219
        
            <para>

     
···

       187
       223
        
           </listitem>

     

       188
       224
        
          </varlistentry>

     

       189
       225
        
          <varlistentry>

     

       190
       190
       -
           <term><option>--show-trace</option>

     

       226
       226
       +
           <term>

     

       227
       227
       +
            <option>--show-trace</option>

     

       191
       228
        
           </term>

     

       192
       229
        
           <listitem>

     

       193
       230
        
            <para>

     
···

       197
       234
        
           </listitem>

     

       198
       235
        
          </varlistentry>

     

       199
       236
        
          <varlistentry>

     

       200
       200
       -
           <term><option>--help</option>

     

       237
       237
       +
           <term>

     

       238
       238
       +
            <option>--help</option>

     

       201
       239
        
           </term>

     

       202
       240
        
           <listitem>

     

       203
       241
        
            <para>

+21 -9

nixos/doc/manual/man-nixos-option.xml

···

       12
       12
        
         </refname><refpurpose>inspect a NixOS configuration</refpurpose>

     

       13
       13
        
        </refnamediv>

     

       14
       14
        
        <refsynopsisdiv>

     

       15
       15
       -
         <cmdsynopsis><command>nixos-option</command>

     

       16
       16
       -
          <arg><option>-I</option><replaceable>path</replaceable>

     

       15
       15
       +
         <cmdsynopsis>

     

       16
       16
       +
          <command>nixos-option</command> 

     

       17
       17
       +
          <arg>

     

       18
       18
       +
           <option>-I</option><replaceable>path</replaceable>

     

       17
       19
        
          </arg>

     

       18
       18
       -
          <arg><option>--verbose</option>

     

       20
       20
       +
           

     

       21
       21
       +
          <arg>

     

       22
       22
       +
           <option>--verbose</option>

     

       19
       23
        
          </arg>

     

       20
       20
       -
          <arg><option>--xml</option>

     

       24
       24
       +
           

     

       25
       25
       +
          <arg>

     

       26
       26
       +
           <option>--xml</option>

     

       21
       27
        
          </arg>

     

       22
       22
       -
          <arg choice="plain"><replaceable>option.name</replaceable>

     

       28
       28
       +
           

     

       29
       29
       +
          <arg choice="plain">

     

       30
       30
       +
           <replaceable>option.name</replaceable>

     

       23
       31
        
          </arg>

     

       24
       32
        
         </cmdsynopsis>

     

       25
       33
        
        </refsynopsisdiv>

     
···

       42
       50
        
         </para>

     

       43
       51
        
         <variablelist>

     

       44
       52
        
          <varlistentry>

     

       45
       45
       -
           <term><option>-I</option><replaceable>path</replaceable>

     

       53
       53
       +
           <term>

     

       54
       54
       +
            <option>-I</option><replaceable>path</replaceable>

     

       46
       55
        
           </term>

     

       47
       56
        
           <listitem>

     

       48
       57
        
            <para>

     
···

       52
       61
        
           </listitem>

     

       53
       62
        
          </varlistentry>

     

       54
       63
        
          <varlistentry>

     

       55
       55
       -
           <term><option>--verbose</option>

     

       64
       64
       +
           <term>

     

       65
       65
       +
            <option>--verbose</option>

     

       56
       66
        
           </term>

     

       57
       67
        
           <listitem>

     

       58
       68
        
            <para>

     
···

       62
       72
        
           </listitem>

     

       63
       73
        
          </varlistentry>

     

       64
       74
        
          <varlistentry>

     

       65
       65
       -
           <term><option>--xml</option>

     

       75
       75
       +
           <term>

     

       76
       76
       +
            <option>--xml</option>

     

       66
       77
        
           </term>

     

       67
       78
        
           <listitem>

     

       68
       79
        
            <para>

     
···

       76
       87
        
         <title>Environment</title>

     

       77
       88
        
         <variablelist>

     

       78
       89
        
          <varlistentry>

     

       79
       79
       -
           <term><envar>NIXOS_CONFIG</envar>

     

       90
       90
       +
           <term>

     

       91
       91
       +
            <envar>NIXOS_CONFIG</envar>

     

       80
       92
        
           </term>

     

       81
       93
        
           <listitem>

     

       82
       94
        
            <para>

+94 -41

nixos/doc/manual/man-nixos-rebuild.xml

···

       12
       12
        
         </refname><refpurpose>reconfigure a NixOS machine</refpurpose>

     

       13
       13
        
        </refnamediv>

     

       14
       14
        
        <refsynopsisdiv>

     

       15
       15
       -
         <cmdsynopsis><command>nixos-rebuild</command><group choice='req'>

     

       16
       16
       -
          <arg choice='plain'><option>switch</option>

     

       15
       15
       +
         <cmdsynopsis>

     

       16
       16
       +
          <command>nixos-rebuild</command><group choice='req'> 

     

       17
       17
       +
          <arg choice='plain'>

     

       18
       18
       +
           <option>switch</option>

     

       17
       19
        
          </arg>

     

       18
       18
       -
          <arg choice='plain'><option>boot</option>

     

       20
       20
       +
           

     

       21
       21
       +
          <arg choice='plain'>

     

       22
       22
       +
           <option>boot</option>

     

       19
       23
        
          </arg>

     

       20
       20
       -
          <arg choice='plain'><option>test</option>

     

       24
       24
       +
           

     

       25
       25
       +
          <arg choice='plain'>

     

       26
       26
       +
           <option>test</option>

     

       21
       27
        
          </arg>

     

       22
       22
       -
          <arg choice='plain'><option>build</option>

     

       28
       28
       +
           

     

       29
       29
       +
          <arg choice='plain'>

     

       30
       30
       +
           <option>build</option>

     

       23
       31
        
          </arg>

     

       24
       24
       -
          <arg choice='plain'><option>dry-build</option>

     

       32
       32
       +
           

     

       33
       33
       +
          <arg choice='plain'>

     

       34
       34
       +
           <option>dry-build</option>

     

       25
       35
        
          </arg>

     

       26
       26
       -
          <arg choice='plain'><option>dry-activate</option>

     

       36
       36
       +
           

     

       37
       37
       +
          <arg choice='plain'>

     

       38
       38
       +
           <option>dry-activate</option>

     

       27
       39
        
          </arg>

     

       28
       28
       -
          <arg choice='plain'><option>build-vm</option>

     

       40
       40
       +
           

     

       41
       41
       +
          <arg choice='plain'>

     

       42
       42
       +
           <option>build-vm</option>

     

       29
       43
        
          </arg>

     

       30
       30
       -
          <arg choice='plain'><option>build-vm-with-bootloader</option>

     

       31
       31
       -
          </arg></group>

     

       44
       44
       +
           

     

       45
       45
       +
          <arg choice='plain'>

     

       46
       46
       +
           <option>build-vm-with-bootloader</option>

     

       47
       47
       +
          </arg>

     

       48
       48
       +
           </group>

     

       32
       49
        
          <sbr />

     

       33
       33
       -
          <arg><option>--upgrade</option>

     

       50
       50
       +
          <arg>

     

       51
       51
       +
           <option>--upgrade</option>

     

       34
       52
        
          </arg>

     

       35
       35
       -
          <arg><option>--install-bootloader</option>

     

       53
       53
       +
           

     

       54
       54
       +
          <arg>

     

       55
       55
       +
           <option>--install-bootloader</option>

     

       36
       56
        
          </arg>

     

       37
       37
       -
          <arg><option>--no-build-nix</option>

     

       57
       57
       +
           

     

       58
       58
       +
          <arg>

     

       59
       59
       +
           <option>--no-build-nix</option>

     

       38
       60
        
          </arg>

     

       39
       39
       -
          <arg><option>--fast</option>

     

       61
       61
       +
           

     

       62
       62
       +
          <arg>

     

       63
       63
       +
           <option>--fast</option>

     

       40
       64
        
          </arg>

     

       41
       41
       -
          <arg><option>--rollback</option>

     

       65
       65
       +
           

     

       66
       66
       +
          <arg>

     

       67
       67
       +
           <option>--rollback</option>

     

       42
       68
        
          </arg>

     

       43
       69
        
          <sbr />

     

       44
       44
       -
          <arg><group choice='req'>

     

       45
       45
       -
           <arg choice='plain'><option>--profile-name</option>

     

       70
       70
       +
          <arg>

     

       71
       71
       +
           <group choice='req'> 

     

       72
       72
       +
           <arg choice='plain'>

     

       73
       73
       +
            <option>--profile-name</option>

     

       46
       74
        
           </arg>

     

       47
       47
       -
           <arg choice='plain'><option>-p</option>

     

       48
       48
       -
           </arg></group><replaceable>name</replaceable>

     

       75
       75
       +
            

     

       76
       76
       +
           <arg choice='plain'>

     

       77
       77
       +
            <option>-p</option>

     

       78
       78
       +
           </arg>

     

       79
       79
       +
            </group><replaceable>name</replaceable>

     

       49
       80
        
          </arg>

     

       50
       81
        
          <sbr />

     

       51
       51
       -
          <arg><option>--show-trace</option>

     

       82
       82
       +
          <arg>

     

       83
       83
       +
           <option>--show-trace</option>

     

       52
       84
        
          </arg>

     

       53
       85
        
         </cmdsynopsis>

     

       54
       86
        
        </refsynopsisdiv>

     
···

       68
       100
        
          operation. It must be one of the following:

     

       69
       101
        
          <variablelist>

     

       70
       102
        
           <varlistentry>

     

       71
       71
       -
            <term><option>switch</option>

     

       103
       103
       +
            <term>

     

       104
       104
       +
             <option>switch</option>

     

       72
       105
        
            </term>

     

       73
       106
        
            <listitem>

     

       74
       107
        
             <para>

     
···

       82
       115
        
            </listitem>

     

       83
       116
        
           </varlistentry>

     

       84
       117
        
           <varlistentry>

     

       85
       85
       -
            <term><option>boot</option>

     

       118
       118
       +
            <term>

     

       119
       119
       +
             <option>boot</option>

     

       86
       120
        
            </term>

     

       87
       121
        
            <listitem>

     

       88
       122
        
             <para>

     
···

       94
       128
        
            </listitem>

     

       95
       129
        
           </varlistentry>

     

       96
       130
        
           <varlistentry>

     

       97
       97
       -
            <term><option>test</option>

     

       131
       131
       +
            <term>

     

       132
       132
       +
             <option>test</option>

     

       98
       133
        
            </term>

     

       99
       134
        
            <listitem>

     

       100
       135
        
             <para>

     
···

       107
       142
        
            </listitem>

     

       108
       143
        
           </varlistentry>

     

       109
       144
        
           <varlistentry>

     

       110
       110
       -
            <term><option>build</option>

     

       145
       145
       +
            <term>

     

       146
       146
       +
             <option>build</option>

     

       111
       147
        
            </term>

     

       112
       148
        
            <listitem>

     

       113
       149
        
             <para>

     
···

       124
       160
        
            </listitem>

     

       125
       161
        
           </varlistentry>

     

       126
       162
        
           <varlistentry>

     

       127
       127
       -
            <term><option>dry-build</option>

     

       163
       163
       +
            <term>

     

       164
       164
       +
             <option>dry-build</option>

     

       128
       165
        
            </term>

     

       129
       166
        
            <listitem>

     

       130
       167
        
             <para>

     
···

       134
       171
        
            </listitem>

     

       135
       172
        
           </varlistentry>

     

       136
       173
        
           <varlistentry>

     

       137
       137
       -
            <term><option>dry-activate</option>

     

       174
       174
       +
            <term>

     

       175
       175
       +
             <option>dry-activate</option>

     

       138
       176
        
            </term>

     

       139
       177
        
            <listitem>

     

       140
       178
        
             <para>

     
···

       147
       185
        
            </listitem>

     

       148
       186
        
           </varlistentry>

     

       149
       187
        
           <varlistentry>

     

       150
       150
       -
            <term><option>build-vm</option>

     

       188
       188
       +
            <term>

     

       189
       189
       +
             <option>build-vm</option>

     

       151
       190
        
            </term>

     

       152
       191
        
            <listitem>

     

       153
       192
        
             <para>

     
···

       186
       225
        
            </listitem>

     

       187
       226
        
           </varlistentry>

     

       188
       227
        
           <varlistentry>

     

       189
       189
       -
            <term><option>build-vm-with-bootloader</option>

     

       228
       228
       +
            <term>

     

       229
       229
       +
             <option>build-vm-with-bootloader</option>

     

       190
       230
        
            </term>

     

       191
       231
        
            <listitem>

     

       192
       232
        
             <para>

     
···

       213
       253
        
         </para>

     

       214
       254
        
         <variablelist>

     

       215
       255
        
          <varlistentry>

     

       216
       216
       -
           <term><option>--upgrade</option>

     

       256
       256
       +
           <term>

     

       257
       257
       +
            <option>--upgrade</option>

     

       217
       258
        
           </term>

     

       218
       259
        
           <listitem>

     

       219
       260
        
            <para>

     
···

       222
       263
        
           </listitem>

     

       223
       264
        
          </varlistentry>

     

       224
       265
        
          <varlistentry>

     

       225
       225
       -
           <term><option>--install-bootloader</option>

     

       266
       266
       +
           <term>

     

       267
       267
       +
            <option>--install-bootloader</option>

     

       226
       268
        
           </term>

     

       227
       269
        
           <listitem>

     

       228
       270
        
            <para>

     
···

       232
       274
        
           </listitem>

     

       233
       275
        
          </varlistentry>

     

       234
       276
        
          <varlistentry>

     

       235
       235
       -
           <term><option>--no-build-nix</option>

     

       277
       277
       +
           <term>

     

       278
       278
       +
            <option>--no-build-nix</option>

     

       236
       279
        
           </term>

     

       237
       280
        
           <listitem>

     

       238
       281
        
            <para>

     
···

       246
       289
        
           </listitem>

     

       247
       290
        
          </varlistentry>

     

       248
       291
        
          <varlistentry>

     

       249
       249
       -
           <term><option>--fast</option>

     

       292
       292
       +
           <term>

     

       293
       293
       +
            <option>--fast</option>

     

       250
       294
        
           </term>

     

       251
       295
        
           <listitem>

     

       252
       296
        
            <para>

     
···

       258
       302
        
           </listitem>

     

       259
       303
        
          </varlistentry>

     

       260
       304
        
          <varlistentry>

     

       261
       261
       -
           <term><option>--rollback</option>

     

       305
       305
       +
           <term>

     

       306
       306
       +
            <option>--rollback</option>

     

       262
       307
        
           </term>

     

       263
       308
        
           <listitem>

     

       264
       309
        
            <para>

     
···

       271
       316
        
           </listitem>

     

       272
       317
        
          </varlistentry>

     

       273
       318
        
          <varlistentry>

     

       274
       274
       -
           <term><option>--profile-name</option>

     

       319
       319
       +
           <term>

     

       320
       320
       +
            <option>--profile-name</option>

     

       275
       321
        
           </term>

     

       276
       276
       -
           <term><option>-p</option>

     

       322
       322
       +
           <term>

     

       323
       323
       +
            <option>-p</option>

     

       277
       324
        
           </term>

     

       278
       325
        
           <listitem>

     

       279
       326
        
            <para>

     
···

       299
       346
        
           </listitem>

     

       300
       347
        
          </varlistentry>

     

       301
       348
        
          <varlistentry>

     

       302
       302
       -
           <term><option>--build-host</option>

     

       349
       349
       +
           <term>

     

       350
       350
       +
            <option>--build-host</option>

     

       303
       351
        
           </term>

     

       304
       352
        
           <listitem>

     

       305
       353
        
            <para>

     
···

       323
       371
        
           </listitem>

     

       324
       372
        
          </varlistentry>

     

       325
       373
        
          <varlistentry>

     

       326
       326
       -
           <term><option>--target-host</option>

     

       374
       374
       +
           <term>

     

       375
       375
       +
            <option>--target-host</option>

     

       327
       376
        
           </term>

     

       328
       377
        
           <listitem>

     

       329
       378
        
            <para>

     
···

       361
       410
        
         <title>Environment</title>

     

       362
       411
        
         <variablelist>

     

       363
       412
        
          <varlistentry>

     

       364
       364
       -
           <term><envar>NIXOS_CONFIG</envar>

     

       413
       413
       +
           <term>

     

       414
       414
       +
            <envar>NIXOS_CONFIG</envar>

     

       365
       415
        
           </term>

     

       366
       416
        
           <listitem>

     

       367
       417
        
            <para>

     
···

       371
       421
        
           </listitem>

     

       372
       422
        
          </varlistentry>

     

       373
       423
        
          <varlistentry>

     

       374
       374
       -
           <term><envar>NIX_SSHOPTS</envar>

     

       424
       424
       +
           <term>

     

       425
       425
       +
            <envar>NIX_SSHOPTS</envar>

     

       375
       426
        
           </term>

     

       376
       427
        
           <listitem>

     

       377
       428
        
            <para>

     
···

       386
       437
        
         <title>Files</title>

     

       387
       438
        
         <variablelist>

     

       388
       439
        
          <varlistentry>

     

       389
       389
       -
           <term><filename>/run/current-system</filename>

     

       440
       440
       +
           <term>

     

       441
       441
       +
            <filename>/run/current-system</filename>

     

       390
       442
        
           </term>

     

       391
       443
        
           <listitem>

     

       392
       444
        
            <para>

     
···

       395
       447
        
           </listitem>

     

       396
       448
        
          </varlistentry>

     

       397
       449
        
          <varlistentry>

     

       398
       398
       -
           <term><filename>/nix/var/nix/profiles/system</filename>

     

       450
       450
       +
           <term>

     

       451
       451
       +
            <filename>/nix/var/nix/profiles/system</filename>

     

       399
       452
        
           </term>

     

       400
       453
        
           <listitem>

     

       401
       454
        
            <para>

+19 -9

nixos/doc/manual/man-nixos-version.xml

···

       11
       11
        
         </refname><refpurpose>show the NixOS version</refpurpose>

     

       12
       12
        
        </refnamediv>

     

       13
       13
        
        <refsynopsisdiv>

     

       14
       14
       -
         <cmdsynopsis><command>nixos-version</command>

     

       15
       15
       -
          <arg><option>--hash</option>

     

       14
       14
       +
         <cmdsynopsis>

     

       15
       15
       +
          <command>nixos-version</command> 

     

       16
       16
       +
          <arg>

     

       17
       17
       +
           <option>--hash</option>

     

       16
       18
        
          </arg>

     

       17
       17
       -
          <arg><option>--revision</option>

     

       19
       19
       +
           

     

       20
       20
       +
          <arg>

     

       21
       21
       +
           <option>--revision</option>

     

       18
       22
        
          </arg>

     

       19
       23
        
         </cmdsynopsis>

     

       20
       24
        
        </refsynopsisdiv>

     
···

       29
       33
        
          The version consists of the following elements:

     

       30
       34
        
          <variablelist>

     

       31
       35
        
           <varlistentry>

     

       32
       32
       -
            <term><literal>16.03</literal>

     

       36
       36
       +
            <term>

     

       37
       37
       +
             <literal>16.03</literal>

     

       33
       38
        
            </term>

     

       34
       39
        
            <listitem>

     

       35
       40
        
             <para>

     
···

       39
       44
        
            </listitem>

     

       40
       45
        
           </varlistentry>

     

       41
       46
        
           <varlistentry>

     

       42
       42
       -
            <term><literal>1011</literal>

     

       47
       47
       +
            <term>

     

       48
       48
       +
             <literal>1011</literal>

     

       43
       49
        
            </term>

     

       44
       50
        
            <listitem>

     

       45
       51
        
             <para>

     
···

       53
       59
        
            </listitem>

     

       54
       60
        
           </varlistentry>

     

       55
       61
        
           <varlistentry>

     

       56
       56
       -
            <term><literal>6317da4</literal>

     

       62
       62
       +
            <term>

     

       63
       63
       +
             <literal>6317da4</literal>

     

       57
       64
        
            </term>

     

       58
       65
        
            <listitem>

     

       59
       66
        
             <para>

     
···

       63
       70
        
            </listitem>

     

       64
       71
        
           </varlistentry>

     

       65
       72
        
           <varlistentry>

     

       66
       66
       -
            <term><literal>Emu</literal>

     

       73
       73
       +
            <term>

     

       74
       74
       +
             <literal>Emu</literal>

     

       67
       75
        
            </term>

     

       68
       76
        
            <listitem>

     

       69
       77
        
             <para>

     
···

       83
       91
        
         </para>

     

       84
       92
        
         <variablelist>

     

       85
       93
        
          <varlistentry>

     

       86
       86
       -
           <term><option>--hash</option>

     

       94
       94
       +
           <term>

     

       95
       95
       +
            <option>--hash</option>

     

       87
       96
        
           </term>

     

       88
       88
       -
           <term><option>--revision</option>

     

       97
       97
       +
           <term>

     

       98
       98
       +
            <option>--revision</option>

     

       89
       99
        
           </term>

     

       90
       100
        
           <listitem>

     

       91
       101
        
            <para>

+5 -5

nixos/doc/manual/release-notes/rl-1509.xml

···

       435
       435
        
       <programlisting>

     

       436
       436
        
       system.nixos.stateVersion = "14.12";

     

       437
       437
        
       </programlisting>

     

       438
       438
       -
            The new option <option>system.nixos.stateVersion</option> ensures that certain

     

       439
       439
       -
            configuration changes that could break existing systems (such as the

     

       440
       440
       -
            <command>sshd</command> host key setting) will maintain compatibility with

     

       441
       441
       -
            the specified NixOS release. NixOps sets the state version of existing

     

       442
       442
       -
            deployments automatically.

     

       438
       438
       +
            The new option <option>system.nixos.stateVersion</option> ensures that

     

       439
       439
       +
            certain configuration changes that could break existing systems (such as

     

       440
       440
       +
            the <command>sshd</command> host key setting) will maintain compatibility

     

       441
       441
       +
            with the specified NixOS release. NixOps sets the state version of

     

       442
       442
       +
            existing deployments automatically.

     

       443
       443
        
           </para>

     

       444
       444
        
          </listitem>

     

       445
       445
        
          <listitem>

+59 -42

nixos/doc/manual/release-notes/rl-1809.xml

···

       53
       53
        
       

     

       54
       54
        
         <itemizedlist>

     

       55
       55
        
          <listitem>

     

       56
       56
       -
            <para>When enabled the <literal>iproute2</literal> will copy the files

     

       57
       57
       -
              expected by ip route (e.g., <filename>rt_tables</filename>) in

     

       58
       58
       -
              <filename>/run/iproute2</filename>. This allows to write aliases for

     

       59
       59
       -
              routing tables for instance.</para>

     

       56
       56
       +
           <para>

     

       57
       57
       +
            When enabled the <literal>iproute2</literal> will copy the files expected

     

       58
       58
       +
            by ip route (e.g., <filename>rt_tables</filename>) in

     

       59
       59
       +
            <filename>/run/iproute2</filename>. This allows to write aliases for

     

       60
       60
       +
            routing tables for instance.

     

       61
       61
       +
           </para>

     

       60
       62
        
          </listitem>

     

       61
       63
        
         </itemizedlist>

     

       62
       64
        
        </section>

     
···

       99
       101
        
          </listitem>

     

       100
       102
        
          <listitem>

     

       101
       103
        
           <para>

     

       102
       102
       -
            The <varname>services.docker-registry.extraConfig</varname> object doesn't contain

     

       103
       103
       -
            environment variables anymore. Instead it needs to provide an object structure

     

       104
       104
       -
            that can be mapped onto the YAML configuration defined in <link xlink:href="https://github.com/docker/distribution/blob/v2.6.2/docs/configuration.md">the <varname>docker/distribution</varname> docs</link>.

     

       104
       104
       +
            The <varname>services.docker-registry.extraConfig</varname> object doesn't

     

       105
       105
       +
            contain environment variables anymore. Instead it needs to provide an

     

       106
       106
       +
            object structure that can be mapped onto the YAML configuration defined in

     

       107
       107
       +
            <link xlink:href="https://github.com/docker/distribution/blob/v2.6.2/docs/configuration.md">the

     

       108
       108
       +
            <varname>docker/distribution</varname> docs</link>.

     

       105
       109
        
           </para>

     

       106
       110
        
          </listitem>

     

       107
       111
        
          <listitem>

     

       108
       112
        
           <para>

     

       109
       109
       -
            <literal>gnucash</literal> has changed from version 2.4 to 3.x.

     

       110
       110
       -
            If you've been using <literal>gnucash</literal> (version 2.4) instead of

     

       111
       111
       -
            <literal>gnucash26</literal> (version 2.6) you must open your Gnucash 

     

       112
       112
       -
            data file(s) with <literal>gnucash26</literal> and then save them to

     

       113
       113
       -
            upgrade the file format. Then you may use your data file(s) with

     

       114
       114
       -
            Gnucash 3.x. See the upgrade <link xlink:href="https://wiki.gnucash.org/wiki/FAQ#Using_Different_Versions.2C_Up_And_Downgrade">documentation</link>.

     

       115
       115
       -
            Gnucash 2.4 is still available under the attribute <literal>gnucash24</literal>.

     

       113
       113
       +
            <literal>gnucash</literal> has changed from version 2.4 to 3.x. If you've

     

       114
       114
       +
            been using <literal>gnucash</literal> (version 2.4) instead of

     

       115
       115
       +
            <literal>gnucash26</literal> (version 2.6) you must open your Gnucash data

     

       116
       116
       +
            file(s) with <literal>gnucash26</literal> and then save them to upgrade

     

       117
       117
       +
            the file format. Then you may use your data file(s) with Gnucash 3.x. See

     

       118
       118
       +
            the upgrade

     

       119
       119
       +
            <link xlink:href="https://wiki.gnucash.org/wiki/FAQ#Using_Different_Versions.2C_Up_And_Downgrade">documentation</link>.

     

       120
       120
       +
            Gnucash 2.4 is still available under the attribute

     

       121
       121
       +
            <literal>gnucash24</literal>.

     

       116
       122
        
           </para>

     

       117
       123
        
          </listitem>

     

       118
       124
        
         </itemizedlist>

     
···

       128
       134
        
         <itemizedlist>

     

       129
       135
        
          <listitem>

     

       130
       136
        
           <para>

     

       131
       131
       -
            <literal>dockerTools.pullImage</literal> relies on image digest

     

       132
       132
       -
            instead of image tag to download the image. The

     

       133
       133
       -
            <literal>sha256</literal> of a pulled image has to be updated.

     

       137
       137
       +
            <literal>dockerTools.pullImage</literal> relies on image digest instead of

     

       138
       138
       +
            image tag to download the image. The <literal>sha256</literal> of a pulled

     

       139
       139
       +
            image has to be updated.

     

       134
       140
        
           </para>

     

       135
       141
        
          </listitem>

     

       136
       142
        
          <listitem>

     
···

       187
       193
        
           <para>

     

       188
       194
        
            The module for <option>security.dhparams</option> has two new options now:

     

       189
       195
        
           </para>

     

       190
       190
       -
       

     

       191
       196
        
           <variablelist>

     

       192
       197
        
            <varlistentry>

     

       193
       193
       -
             <term><option>security.dhparams.stateless</option></term>

     

       194
       194
       -
             <listitem><para>

     

       195
       195
       -
              Puts the generated Diffie-Hellman parameters into the Nix store instead

     

       196
       196
       -
              of managing them in a stateful manner in

     

       197
       197
       -
              <filename class="directory">/var/lib/dhparams</filename>.

     

       198
       198
       -
             </para></listitem>

     

       198
       198
       +
             <term>

     

       199
       199
       +
              <option>security.dhparams.stateless</option>

     

       200
       200
       +
             </term>

     

       201
       201
       +
             <listitem>

     

       202
       202
       +
              <para>

     

       203
       203
       +
               Puts the generated Diffie-Hellman parameters into the Nix store instead

     

       204
       204
       +
               of managing them in a stateful manner in

     

       205
       205
       +
               <filename class="directory">/var/lib/dhparams</filename>.

     

       206
       206
       +
              </para>

     

       207
       207
       +
             </listitem>

     

       199
       208
        
            </varlistentry>

     

       200
       209
        
            <varlistentry>

     

       201
       201
       -
             <term><option>security.dhparams.defaultBitSize</option></term>

     

       202
       202
       -
             <listitem><para>

     

       203
       203
       -
              The default bit size to use for the generated Diffie-Hellman parameters.

     

       204
       204
       -
             </para></listitem>

     

       210
       210
       +
             <term>

     

       211
       211
       +
              <option>security.dhparams.defaultBitSize</option>

     

       212
       212
       +
             </term>

     

       213
       213
       +
             <listitem>

     

       214
       214
       +
              <para>

     

       215
       215
       +
               The default bit size to use for the generated Diffie-Hellman

     

       216
       216
       +
               parameters.

     

       217
       217
       +
              </para>

     

       218
       218
       +
             </listitem>

     

       205
       219
        
            </varlistentry>

     

       206
       220
        
           </variablelist>

     

       207
       207
       -
       

     

       208
       208
       -
           <note><para>

     

       209
       209
       -
            The path to the actual generated parameter files should now be queried

     

       210
       210
       -
            using

     

       211
       211
       -
            <literal>config.security.dhparams.params.<replaceable>name</replaceable>.path</literal>

     

       212
       212
       -
            because it might be either in the Nix store or in a directory configured

     

       213
       213
       -
            by <option>security.dhparams.path</option>.

     

       214
       214
       -
           </para></note>

     

       215
       215
       -
       

     

       221
       221
       +
           <note>

     

       222
       222
       +
            <para>

     

       223
       223
       +
             The path to the actual generated parameter files should now be queried

     

       224
       224
       +
             using

     

       225
       225
       +
             <literal>config.security.dhparams.params.<replaceable>name</replaceable>.path</literal>

     

       226
       226
       +
             because it might be either in the Nix store or in a directory configured

     

       227
       227
       +
             by <option>security.dhparams.path</option>.

     

       228
       228
       +
            </para>

     

       229
       229
       +
           </note>

     

       216
       230
        
           <note>

     

       217
       231
        
            <title>For developers:</title>

     

       218
       232
        
            <para>

     
···

       237
       251
        
          </listitem>

     

       238
       252
        
          <listitem>

     

       239
       253
        
           <para>

     

       240
       240
       -
            <literal>networking.networkmanager.useDnsmasq</literal> has been deprecated. Use

     

       241
       241
       -
            <literal>networking.networkmanager.dns</literal> instead.

     

       254
       254
       +
            <literal>networking.networkmanager.useDnsmasq</literal> has been

     

       255
       255
       +
            deprecated. Use <literal>networking.networkmanager.dns</literal> instead.

     

       242
       256
        
           </para>

     

       243
       257
        
          </listitem>

     

       244
       258
        
          <listitem>

     

       245
       259
        
           <para>

     

       246
       246
       -
            The option <varname>services.kubernetes.apiserver.admissionControl</varname>

     

       247
       247
       -
            was renamed to <varname>services.kubernetes.apiserver.enableAdmissionPlugins</varname>.

     

       260
       260
       +
            The option

     

       261
       261
       +
            <varname>services.kubernetes.apiserver.admissionControl</varname> was

     

       262
       262
       +
            renamed to

     

       263
       263
       +
            <varname>services.kubernetes.apiserver.enableAdmissionPlugins</varname>.

     

       248
       264
        
           </para>

     

       249
       265
        
          </listitem>

     

       250
       266
        
          <listitem>

     

       251
       267
        
           <para>

     

       252
       268
        
            Recommented way to access the Kubernetes Dashboard is with HTTPS (TLS)

     

       253
       253
       -
            Therefore; public service port for the dashboard has changed to 443 (container port 8443) and scheme to https.

     

       269
       269
       +
            Therefore; public service port for the dashboard has changed to 443

     

       270
       270
       +
            (container port 8443) and scheme to https.

     

       254
       271
        
           </para>

     

       255
       272
        
          </listitem>

     

       256
       273
        
         </itemizedlist>