commit 35d8514a9149699cfbf3fe81d62f7b9f59dc2e7e · pyrox.dev/nixpkgs

+1 -1

nixos/doc/manual/installation/installing-behind-a-proxy.xml

···

       40
       40
        
        <note>

     

       41
       41
        
         <para>

     

       42
       42
        
          If you are switching networks with different proxy configurations, use the

     

       43
       43
       -
          <literal>nesting.clone</literal> option in

     

       43
       43
       +
          <literal>specialisation</literal> option in

     

       44
       44
        
          <literal>configuration.nix</literal> to switch proxies at runtime. Refer to

     

       45
       45
        
          <xref linkend="ch-options" /> for more information.

     

       46
       46
        
         </para>

+44

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

···

       203
       203
        
             <link xlink:href="https://github.com/gollum/gollum/wiki/5.0-release-notes#migrating-your-wiki">here</link>.

     

       204
       204
        
            </para>

     

       205
       205
        
          </listitem>

     

       206
       206
       +
       

     

       207
       207
       +
          <listitem>

     

       208
       208
       +
           <para>

     

       209
       209
       +
             The NixOS options <literal>nesting.clone</literal> and

     

       210
       210
       +
             <literal>nesting.children</literal> have been deleted, and

     

       211
       211
       +
             replaced with named <xref linkend="opt-specialisation"/>

     

       212
       212
       +
             configurations.

     

       213
       213
       +
           </para>

     

       214
       214
       +
       

     

       215
       215
       +
           <para>

     

       216
       216
       +
             Replace a <literal>nesting.clone</literal> entry with:

     

       217
       217
       +
       

     

       218
       218
       +
       <programlisting>{

     

       219
       219
       +
       <link xlink:href="#opt-specialisation">specialisation.example-sub-configuration</link> = {

     

       220
       220
       +
         <link xlink:href="#opt-specialisation._name_.configuration">configuration</link> = {

     

       221
       221
       +
           ...

     

       222
       222
       +
         };

     

       223
       223
       +
       };</programlisting>

     

       224
       224
       +
       

     

       225
       225
       +
           </para>

     

       226
       226
       +
           <para>

     

       227
       227
       +
             Replace a <literal>nesting.children</literal> entry with:

     

       228
       228
       +
       

     

       229
       229
       +
       <programlisting>{

     

       230
       230
       +
       <link xlink:href="#opt-specialisation">specialisation.example-sub-configuration</link> = {

     

       231
       231
       +
         <link xlink:href="#opt-specialisation._name_.inheritParentConfig">inheritParentConfig</link> = false;

     

       232
       232
       +
         <link xlink:href="#opt-specialisation._name_.configuration">configuration</link> = {

     

       233
       233
       +
           ...

     

       234
       234
       +
         };

     

       235
       235
       +
       };</programlisting>

     

       236
       236
       +
           </para>

     

       237
       237
       +
       

     

       238
       238
       +
           <para>

     

       239
       239
       +
            To switch to a specialised configuration at runtime you need to

     

       240
       240
       +
            run:

     

       241
       241
       +
       <programlisting>

     

       242
       242
       +
       # sudo /run/current-system/specialisation/example-sub-configuration/bin/switch-to-configuration test

     

       243
       243
       +
       </programlisting>

     

       244
       244
       +
            Before you would have used:

     

       245
       245
       +
       <programlisting>

     

       246
       246
       +
       # sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test

     

       247
       247
       +
       </programlisting>

     

       248
       248
       +
           </para>

     

       249
       249
       +
          </listitem>

     

       206
       250
        
         </itemizedlist>

     

       207
       251
        
        </section>

     

       208
       252

+1 -2

nixos/modules/system/activation/no-clone.nix

···

       4
       4
        
       

     

       5
       5
        
       {

     

       6
       6
        
         boot.loader.grub.device = mkOverride 0 "nodev";

     

       7
       7
       -
         nesting.children = mkOverride 0 [];

     

       8
       8
       -
         nesting.clone = mkOverride 0 [];

     

       7
       7
       +
         specialisation = mkOverride 0 {};

     

       9
       8
        
       }

+35 -30

nixos/modules/system/activation/top-level.nix

···

       11
       11
        
         # you can provide an easy way to boot the same configuration

     

       12
       12
        
         # as you use, but with another kernel

     

       13
       13
        
         # !!! fix this

     

       14
       14
       -
         cloner = inheritParent: list:

     

       15
       15
       -
           map (childConfig:

     

       14
       14
       +
         children = mapAttrs (childName: childConfig:

     

       16
       15
        
             (import ../../../lib/eval-config.nix {

     

       17
       16
        
               inherit baseModules;

     

       18
       17
        
               system = config.nixpkgs.initialSystem;

     

       19
       18
        
               modules =

     

       20
       20
       -
                  (optionals inheritParent modules)

     

       19
       19
       +
                  (optionals childConfig.inheritParentConfig modules)

     

       21
       20
        
               ++ [ ./no-clone.nix ]

     

       22
       22
       -
               ++ [ childConfig ];

     

       21
       21
       +
               ++ [ childConfig.configuration ];

     

       23
       22
        
             }).config.system.build.toplevel

     

       24
       24
       -
           ) list;

     

       25
       25
       -
       

     

       26
       26
       -
         children =

     

       27
       27
       -
            cloner false config.nesting.children

     

       28
       28
       -
         ++ cloner true config.nesting.clone;

     

       23
       23
       +
           ) config.specialisation;

     

       29
       24
        
       

     

       30
       25
        
         systemBuilder =

     

       31
       26
        
           let

     
···

       77
       72
        
             echo -n "$nixosLabel" > $out/nixos-version

     

       78
       73
        
             echo -n "${config.boot.kernelPackages.stdenv.hostPlatform.system}" > $out/system

     

       79
       74
        
       

     

       80
       80
       -
             mkdir $out/fine-tune

     

       81
       81
       -
             childCount=0

     

       82
       82
       -
             for i in $children; do

     

       83
       83
       -
               childCount=$(( childCount + 1 ))

     

       84
       84
       -
               ln -s $i $out/fine-tune/child-$childCount

     

       85
       85
       -
             done

     

       75
       75
       +
             mkdir $out/specialisation

     

       76
       76
       +
             ${concatStringsSep "\n"

     

       77
       77
       +
             (mapAttrsToList (name: path: "ln -s ${path} $out/specialisation/${name}") children)}

     

       86
       78
        
       

     

       87
       79
        
             mkdir $out/bin

     

       88
       80
        
             export localeArchive="${config.i18n.glibcLocales}/lib/locale/locale-archive"

     
···

       112
       104
        
           shell = "${pkgs.bash}/bin/sh";

     

       113
       105
        
           su = "${pkgs.shadow.su}/bin/su";

     

       114
       106
        
       

     

       115
       115
       -
           inherit children;

     

       116
       107
        
           kernelParams = config.boot.kernelParams;

     

       117
       108
        
           installBootLoader =

     

       118
       109
        
             config.system.build.installBootLoader

     
···

       143
       134
        
       in

     

       144
       135
        
       

     

       145
       136
        
       {

     

       137
       137
       +
         imports = [

     

       138
       138
       +
           (mkRemovedOptionModule [ "nesting" "clone" ] "Use `specialisation.«name» = { inheritParentConfig = true; configuration = { ... }; }` instead.")

     

       139
       139
       +
           (mkRemovedOptionModule [ "nesting" "children" ] "Use `specialisation.«name».configuration = { ... }` instead.")

     

       140
       140
       +
         ];

     

       141
       141
       +
       

     

       146
       142
        
         options = {

     

       147
       143
        
       

     

       148
       144
        
           system.build = mkOption {

     
···

       154
       150
        
             '';

     

       155
       151
        
           };

     

       156
       152
        
       

     

       157
       157
       -
           nesting.children = mkOption {

     

       158
       158
       -
             default = [];

     

       153
       153
       +
           specialisation = mkOption {

     

       154
       154
       +
             default = {};

     

       155
       155
       +
             example = lib.literalExample "{ fewJobsManyCores.configuration = { nix.buildCores = 0; nix.maxJobs = 1; }; }";

     

       159
       156
        
             description = ''

     

       160
       160
       -
               Additional configurations to build.

     

       161
       161
       -
             '';

     

       162
       162
       -
           };

     

       163
       163
       -
       

     

       164
       164
       -
           nesting.clone = mkOption {

     

       165
       165
       -
             default = [];

     

       166
       166
       -
             description = ''

     

       167
       167
       -
               Additional configurations to build based on the current

     

       168
       168
       -
               configuration which then has a lower priority.

     

       157
       157
       +
               Additional configurations to build. If

     

       158
       158
       +
               <literal>inheritParentConfig</literal> is true, the system

     

       159
       159
       +
               will be based on the overall system configuration.

     

       169
       160
        
       

     

       170
       170
       -
               To switch to a cloned configuration (e.g. <literal>child-1</literal>)

     

       171
       171
       -
               at runtime, run

     

       161
       161
       +
               To switch to a specialised configuration

     

       162
       162
       +
               (e.g. <literal>fewJobsManyCores</literal>) at runtime, run:

     

       172
       163
        
       

     

       173
       164
        
               <programlisting>

     

       174
       174
       -
               # sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test

     

       165
       165
       +
               # sudo /run/current-system/specialisation/fewJobsManyCores/bin/switch-to-configuration test

     

       175
       166
        
               </programlisting>

     

       176
       167
        
             '';

     

       168
       168
       +
             type = types.attrsOf (types.submodule (

     

       169
       169
       +
               { ... }: {

     

       170
       170
       +
                 options.inheritParentConfig = mkOption {

     

       171
       171
       +
                   type = types.bool;

     

       172
       172
       +
                   default = true;

     

       173
       173
       +
                   description = "Include the entire system's configuration. Set to false to make a completely differently configured system.";

     

       174
       174
       +
                 };

     

       175
       175
       +
       

     

       176
       176
       +
                 options.configuration = mkOption {

     

       177
       177
       +
                   default = {};

     

       178
       178
       +
                   description = "Arbitrary NixOS configuration options.";

     

       179
       179
       +
                 };

     

       180
       180
       +
               })

     

       181
       181
       +
             );

     

       177
       182
        
           };

     

       178
       183
        
       

     

       179
       184
        
           system.boot.loader.id = mkOption {

+3 -2

nixos/modules/system/boot/loader/grub/install-grub.pl

···

       409
       409
        
       

     

       410
       410
        
       # Find all the children of the current default configuration

     

       411
       411
        
       # Do not search for grand children

     

       412
       412
       -
       my @links = sort (glob "$defaultConfig/fine-tune/*");

     

       412
       412
       +
       my @links = sort (glob "$defaultConfig/specialisation/*");

     

       413
       413
        
       foreach my $link (@links) {

     

       414
       414
        
       

     

       415
       415
        
           my $entryName = "";

     
···

       425
       425
        
           if ($cfgName) {

     

       426
       426
        
               $entryName = $cfgName;

     

       427
       427
        
           } else {

     

       428
       428
       -
               $entryName = "($date - $version)";

     

       428
       428
       +
               my $linkname = basename($link);

     

       429
       429
       +
               $entryName = "($linkname - $date - $version)";

     

       429
       430
        
           }

     

       430
       431
        
           addEntry("NixOS - $entryName", $link);

     

       431
       432
        
       }

+1 -1

nixos/modules/system/boot/loader/init-script/init-script-builder.sh

···

       69
       69
        
       

     

       70
       70
        
       # Add all generations of the system profile to the menu, in reverse

     

       71
       71
        
       # (most recent to least recent) order.

     

       72
       72
       -
       for link in $((ls -d $defaultConfig/fine-tune/* ) | sort -n); do

     

       72
       72
       +
       for link in $((ls -d $defaultConfig/specialisation/* ) | sort -n); do

     

       73
       73
        
           date=$(stat --printf="%y\n" $link | sed 's/\..*//')

     

       74
       74
        
           addEntry "NixOS - variation" $link ""

     

       75
       75
        
       done

+46 -48

nixos/tests/acme.nix

···

       91
       91
        
       

     

       92
       92
        
             security.acme.server = "https://acme-v02.api.letsencrypt.org/dir";

     

       93
       93
        
       

     

       94
       94
       -
             nesting.clone = [

     

       95
       95
       -
               ({pkgs, ...}: {

     

       96
       96
       -
                 systemd.targets."acme-finished-b.example.com" = {};

     

       97
       97
       -
                 systemd.services."acme-b.example.com" = {

     

       98
       98
       -
                   wants = [ "acme-finished-b.example.com.target" ];

     

       99
       99
       -
                   before = [ "acme-finished-b.example.com.target" ];

     

       100
       100
       -
                   after = [ "nginx.service" ];

     

       101
       101
       -
                 };

     

       102
       102
       -
                 services.nginx.virtualHosts."b.example.com" = {

     

       103
       103
       -
                   enableACME = true;

     

       104
       104
       -
                   forceSSL = true;

     

       105
       105
       -
                   locations."/".root = pkgs.runCommand "docroot" {} ''

     

       106
       106
       -
                     mkdir -p "$out"

     

       107
       107
       -
                     echo hello world > "$out/index.html"

     

       108
       108
       -
                   '';

     

       109
       109
       -
                 };

     

       110
       110
       -
               })

     

       111
       111
       -
               ({pkgs, config, nodes, lib, ...}: {

     

       112
       112
       -
                 security.acme.certs."example.com" = {

     

       113
       113
       -
                   domain = "*.example.com";

     

       114
       114
       -
                   dnsProvider = "exec";

     

       115
       115
       -
                   dnsPropagationCheck = false;

     

       116
       116
       -
                   credentialsFile = with pkgs; writeText "wildcard.env" ''

     

       117
       117
       -
                     EXEC_PATH=${dnsScript { inherit writeScript bash curl; dnsAddress = nodes.dnsserver.config.networking.primaryIPAddress; }}

     

       118
       118
       -
                   '';

     

       119
       119
       -
                   user = config.services.nginx.user;

     

       120
       120
       -
                   group = config.services.nginx.group;

     

       121
       121
       -
                 };

     

       122
       122
       -
                 systemd.targets."acme-finished-example.com" = {};

     

       123
       123
       -
                 systemd.services."acme-example.com" = {

     

       124
       124
       -
                   wants = [ "acme-finished-example.com.target" ];

     

       125
       125
       -
                   before = [ "acme-finished-example.com.target" "nginx.service" ];

     

       126
       126
       -
                   wantedBy = [ "nginx.service" ];

     

       127
       127
       -
                 };

     

       128
       128
       -
                 services.nginx.virtualHosts."c.example.com" = {

     

       129
       129
       -
                   forceSSL = true;

     

       130
       130
       -
                   sslCertificate = config.security.acme.certs."example.com".directory + "/cert.pem";

     

       131
       131
       -
                   sslTrustedCertificate = config.security.acme.certs."example.com".directory + "/full.pem";

     

       132
       132
       -
                   sslCertificateKey = config.security.acme.certs."example.com".directory + "/key.pem";

     

       133
       133
       -
                   locations."/".root = pkgs.runCommand "docroot" {} ''

     

       134
       134
       -
                     mkdir -p "$out"

     

       135
       135
       -
                     echo hello world > "$out/index.html"

     

       136
       136
       -
                   '';

     

       137
       137
       -
                 };

     

       138
       138
       -
               })

     

       139
       139
       -
             ];

     

       94
       94
       +
             specialisation.second-cert.configuration = {pkgs, ...}: {

     

       95
       95
       +
               systemd.targets."acme-finished-b.example.com" = {};

     

       96
       96
       +
               systemd.services."acme-b.example.com" = {

     

       97
       97
       +
                 wants = [ "acme-finished-b.example.com.target" ];

     

       98
       98
       +
                 before = [ "acme-finished-b.example.com.target" ];

     

       99
       99
       +
                 after = [ "nginx.service" ];

     

       100
       100
       +
               };

     

       101
       101
       +
               services.nginx.virtualHosts."b.example.com" = {

     

       102
       102
       +
                 enableACME = true;

     

       103
       103
       +
                 forceSSL = true;

     

       104
       104
       +
                 locations."/".root = pkgs.runCommand "docroot" {} ''

     

       105
       105
       +
                   mkdir -p "$out"

     

       106
       106
       +
                   echo hello world > "$out/index.html"

     

       107
       107
       +
                 '';

     

       108
       108
       +
               };

     

       109
       109
       +
             };

     

       110
       110
       +
             specialisation.dns-01.configuration = {pkgs, config, nodes, lib, ...}: {

     

       111
       111
       +
               security.acme.certs."example.com" = {

     

       112
       112
       +
                 domain = "*.example.com";

     

       113
       113
       +
                 dnsProvider = "exec";

     

       114
       114
       +
                 dnsPropagationCheck = false;

     

       115
       115
       +
                 credentialsFile = with pkgs; writeText "wildcard.env" ''

     

       116
       116
       +
                   EXEC_PATH=${dnsScript { inherit writeScript bash curl; dnsAddress = nodes.dnsserver.config.networking.primaryIPAddress; }}

     

       117
       117
       +
                 '';

     

       118
       118
       +
                 user = config.services.nginx.user;

     

       119
       119
       +
                 group = config.services.nginx.group;

     

       120
       120
       +
               };

     

       121
       121
       +
               systemd.targets."acme-finished-example.com" = {};

     

       122
       122
       +
               systemd.services."acme-example.com" = {

     

       123
       123
       +
                 wants = [ "acme-finished-example.com.target" ];

     

       124
       124
       +
                 before = [ "acme-finished-example.com.target" "nginx.service" ];

     

       125
       125
       +
                 wantedBy = [ "nginx.service" ];

     

       126
       126
       +
               };

     

       127
       127
       +
               services.nginx.virtualHosts."c.example.com" = {

     

       128
       128
       +
                 forceSSL = true;

     

       129
       129
       +
                 sslCertificate = config.security.acme.certs."example.com".directory + "/cert.pem";

     

       130
       130
       +
                 sslTrustedCertificate = config.security.acme.certs."example.com".directory + "/full.pem";

     

       131
       131
       +
                 sslCertificateKey = config.security.acme.certs."example.com".directory + "/key.pem";

     

       132
       132
       +
                 locations."/".root = pkgs.runCommand "docroot" {} ''

     

       133
       133
       +
                   mkdir -p "$out"

     

       134
       134
       +
                   echo hello world > "$out/index.html"

     

       135
       135
       +
                 '';

     

       136
       136
       +
               };

     

       137
       137
       +
             };

     

       140
       138
        
           };

     

       141
       139
        
       

     

       142
       140
        
           client = {nodes, lib, ...}: {

     
···

       196
       194
        
       

     

       197
       195
        
             with subtest("Can add another certificate for nginx service"):

     

       198
       196
        
                 webserver.succeed(

     

       199
       199
       -
                     "/run/current-system/fine-tune/child-1/bin/switch-to-configuration test"

     

       197
       197
       +
                     "/run/current-system/specialisation/second-cert/bin/switch-to-configuration test"

     

       200
       198
        
                 )

     

       201
       199
        
                 webserver.wait_for_unit("acme-finished-b.example.com.target")

     

       202
       200
        
                 client.succeed(

     
···

       208
       206
        
                     "${switchToNewServer}"

     

       209
       207
        
                 )

     

       210
       208
        
                 webserver.succeed(

     

       211
       211
       -
                     "/run/current-system/fine-tune/child-2/bin/switch-to-configuration test"

     

       209
       209
       +
                     "/run/current-system/specialisation/dns-01/bin/switch-to-configuration test"

     

       212
       210
        
                 )

     

       213
       211
        
                 webserver.wait_for_unit("acme-finished-example.com.target")

     

       214
       212
        
                 client.succeed(

+1 -1

nixos/tests/all-tests.nix

···

       202
       202
        
         nat.standalone = handleTest ./nat.nix { withFirewall = false; };

     

       203
       203
        
         ndppd = handleTest ./ndppd.nix {};

     

       204
       204
        
         neo4j = handleTest ./neo4j.nix {};

     

       205
       205
       -
         nesting = handleTest ./nesting.nix {};

     

       205
       205
       +
         specialisation = handleTest ./specialisation.nix {};

     

       206
       206
        
         netdata = handleTest ./netdata.nix {};

     

       207
       207
        
         networking.networkd = handleTest ./networking.nix { networkd = true; };

     

       208
       208
        
         networking.scripted = handleTest ./networking.nix { networkd = false; };

+21 -23

nixos/tests/caddy.nix

···

       20
       20
        
               }

     

       21
       21
        
             '';

     

       22
       22
        
       

     

       23
       23
       -
             nesting.clone = [

     

       24
       24
       -
               {

     

       25
       25
       -
                 services.caddy.config = lib.mkForce ''

     

       26
       26
       -
                   http://localhost {

     

       27
       27
       -
                     gzip

     

       23
       23
       +
             specialisation.etag.configuration = {

     

       24
       24
       +
               services.caddy.config = lib.mkForce ''

     

       25
       25
       +
                 http://localhost {

     

       26
       26
       +
                   gzip

     

       28
       27
        
       

     

       29
       29
       -
                     root ${

     

       30
       30
       -
                       pkgs.runCommand "testdir2" {} ''

     

       31
       31
       -
                         mkdir "$out"

     

       32
       32
       -
                         echo changed > "$out/example.html"

     

       33
       33
       -
                       ''

     

       34
       34
       -
                     }

     

       28
       28
       +
                   root ${

     

       29
       29
       +
                     pkgs.runCommand "testdir2" {} ''

     

       30
       30
       +
                       mkdir "$out"

     

       31
       31
       +
                       echo changed > "$out/example.html"

     

       32
       32
       +
                     ''

     

       35
       33
        
                   }

     

       36
       36
       -
                 '';

     

       37
       37
       -
               }

     

       34
       34
       +
                 }

     

       35
       35
       +
               '';

     

       36
       36
       +
             };

     

       38
       37
        
       

     

       39
       39
       -
               {

     

       40
       40
       -
                 services.caddy.config = ''

     

       41
       41
       -
                   http://localhost:8080 {

     

       42
       42
       -
                   }

     

       43
       43
       -
                 '';

     

       44
       44
       -
               }

     

       45
       45
       -
             ];

     

       38
       38
       +
             specialisation.config-reload.configuration = {

     

       39
       39
       +
               services.caddy.config = ''

     

       40
       40
       +
                 http://localhost:8080 {

     

       41
       41
       +
                 }

     

       42
       42
       +
               '';

     

       43
       43
       +
             };

     

       46
       44
        
           };

     

       47
       45
        
         };

     

       48
       46
        
       

     

       49
       47
        
         testScript = { nodes, ... }: let

     

       50
       50
       -
           etagSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-1";

     

       51
       51
       -
           justReloadSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-2";

     

       48
       48
       +
           etagSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/etag";

     

       49
       49
       +
           justReloadSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/config-reload";

     

       52
       50
        
         in ''

     

       53
       51
        
           url = "http://localhost/example.html"

     

       54
       52
        
           webserver.wait_for_unit("caddy")

     
···

       77
       75
        
               assert old_etag != new_etag, "Old ETag {} is the same as {}".format(

     

       78
       76
        
                   old_etag, new_etag

     

       79
       77
        
               )

     

       80
       80
       -
           

     

       78
       78
       +
       

     

       81
       79
        
           with subtest("config is reloaded on nixos-rebuild switch"):

     

       82
       80
        
               webserver.succeed(

     

       83
       81
        
                   "${justReloadSystem}/bin/switch-to-configuration test >&2"

+10 -10

nixos/tests/installer.nix

···

       65
       65
        
         # partitions and filesystems.

     

       66
       66
        
         testScriptFun = { bootLoader, createPartitions, grubVersion, grubDevice, grubUseEfi

     

       67
       67
        
                         , grubIdentifier, preBootCommands, extraConfig

     

       68
       68
       -
                         , testCloneConfig

     

       68
       68
       +
                         , testSpecialisationConfig

     

       69
       69
        
                         }:

     

       70
       70
        
           let iface = if grubVersion == 1 then "ide" else "virtio";

     

       71
       71
        
               isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi);

     
···

       220
       220
        
       

     

       221
       221
        
             # Tests for validating clone configuration entries in grub menu

     

       222
       222
        
           ''

     

       223
       223
       -
           + optionalString testCloneConfig ''

     

       223
       223
       +
           + optionalString testSpecialisationConfig ''

     

       224
       224
        
             # Reboot Machine

     

       225
       225
        
             machine = create_machine_named("clone-default-config")

     

       226
       226
        
             ${preBootCommands}

     
···

       262
       262
        
           , bootLoader ? "grub" # either "grub" or "systemd-boot"

     

       263
       263
        
           , grubVersion ? 2, grubDevice ? "/dev/vda", grubIdentifier ? "uuid", grubUseEfi ? false

     

       264
       264
        
           , enableOCR ? false, meta ? {}

     

       265
       265
       -
           , testCloneConfig ? false

     

       265
       265
       +
           , testSpecialisationConfig ? false

     

       266
       266
        
           }:

     

       267
       267
        
           makeTest {

     

       268
       268
        
             inherit enableOCR;

     
···

       337
       337
        
             testScript = testScriptFun {

     

       338
       338
        
               inherit bootLoader createPartitions preBootCommands

     

       339
       339
        
                       grubVersion grubDevice grubIdentifier grubUseEfi extraConfig

     

       340
       340
       -
                       testCloneConfig;

     

       340
       340
       +
                       testSpecialisationConfig;

     

       341
       341
        
             };

     

       342
       342
        
           };

     

       343
       343
        
       

     
···

       411
       411
        
           grubUseEfi = true;

     

       412
       412
        
         };

     

       413
       413
        
       

     

       414
       414
       -
         clone-test-extraconfig = {

     

       414
       414
       +
         specialisation-test-extraconfig = {

     

       415
       415
        
           extraConfig = ''

     

       416
       416
        
             environment.systemPackages = [ pkgs.grub2 ];

     

       417
       417
        
             boot.loader.grub.configurationName = "Home";

     

       418
       418
       -
             nesting.clone = [ {

     

       418
       418
       +
             specialisation.work.configuration = {

     

       419
       419
        
               boot.loader.grub.configurationName = lib.mkForce "Work";

     

       420
       420
        
       

     

       421
       421
        
               environment.etc = {

     
···

       424
       424
        
                     gitproxy = none for work.com

     

       425
       425
        
                     ";

     

       426
       426
        
               };

     

       427
       427
       -
             } ];

     

       427
       427
       +
             };

     

       428
       428
        
           '';

     

       429
       429
       -
           testCloneConfig = true;

     

       429
       429
       +
           testSpecialisationConfig = true;

     

       430
       430
        
         };

     

       431
       431
        
       

     

       432
       432
        
       

     
···

       440
       440
        
         simple = makeInstallerTest "simple" simple-test-config;

     

       441
       441
        
       

     

       442
       442
        
         # Test cloned configurations with the simple grub configuration

     

       443
       443
       -
         simpleClone = makeInstallerTest "simpleClone" (simple-test-config // clone-test-extraconfig);

     

       443
       443
       +
         simpleSpecialised = makeInstallerTest "simpleSpecialised" (simple-test-config // specialisation-test-extraconfig);

     

       444
       444
        
       

     

       445
       445
        
         # Simple GPT/UEFI configuration using systemd-boot with 3 partitions: ESP, swap & root filesystem

     

       446
       446
        
         simpleUefiSystemdBoot = makeInstallerTest "simpleUefiSystemdBoot" {

     
···

       467
       467
        
         simpleUefiGrub = makeInstallerTest "simpleUefiGrub" simple-uefi-grub-config;

     

       468
       468
        
       

     

       469
       469
        
         # Test cloned configurations with the uefi grub configuration

     

       470
       470
       -
         simpleUefiGrubClone = makeInstallerTest "simpleUefiGrubClone" (simple-uefi-grub-config // clone-test-extraconfig);

     

       470
       470
       +
         simpleUefiGrubSpecialisation = makeInstallerTest "simpleUefiGrubSpecialisation" (simple-uefi-grub-config // specialisation-test-extraconfig);

     

       471
       471
        
       

     

       472
       472
        
         # Same as the previous, but now with a separate /boot partition.

     

       473
       473
        
         separateBoot = makeInstallerTest "separateBoot" {

-44

nixos/tests/nesting.nix

···

       1
       1
       -
       import ./make-test-python.nix {

     

       2
       2
       -
         name = "nesting";

     

       3
       3
       -
         nodes =  {

     

       4
       4
       -
           clone = { pkgs, ... }: {

     

       5
       5
       -
             environment.systemPackages = [ pkgs.cowsay ];

     

       6
       6
       -
             nesting.clone = [

     

       7
       7
       -
               ({ pkgs, ... }: {

     

       8
       8
       -
                 environment.systemPackages = [ pkgs.hello ];

     

       9
       9
       -
               })

     

       10
       10
       -
             ];

     

       11
       11
       -
           };

     

       12
       12
       -
           children = { pkgs, ... }: {

     

       13
       13
       -
             environment.systemPackages = [ pkgs.cowsay ];

     

       14
       14
       -
             nesting.children = [

     

       15
       15
       -
               ({ pkgs, ... }: {

     

       16
       16
       -
                 environment.systemPackages = [ pkgs.hello ];

     

       17
       17
       -
               })

     

       18
       18
       -
             ];

     

       19
       19
       -
           };

     

       20
       20
       -
         };

     

       21
       21
       -
         testScript = ''

     

       22
       22
       -
           clone.wait_for_unit("default.target")

     

       23
       23
       -
           clone.succeed("cowsay hey")

     

       24
       24
       -
           clone.fail("hello")

     

       25
       25
       -
       

     

       26
       26
       -
           with subtest("Nested clones do inherit from parent"):

     

       27
       27
       -
               clone.succeed(

     

       28
       28
       -
                   "/run/current-system/fine-tune/child-1/bin/switch-to-configuration test"

     

       29
       29
       -
               )

     

       30
       30
       -
               clone.succeed("cowsay hey")

     

       31
       31
       -
               clone.succeed("hello")

     

       32
       32
       -
       

     

       33
       33
       -
           children.wait_for_unit("default.target")

     

       34
       34
       -
           children.succeed("cowsay hey")

     

       35
       35
       -
           children.fail("hello")

     

       36
       36
       -
       

     

       37
       37
       -
           with subtest("Nested children do not inherit from parent"):

     

       38
       38
       -
               children.succeed(

     

       39
       39
       -
                   "/run/current-system/fine-tune/child-1/bin/switch-to-configuration test"

     

       40
       40
       -
               )

     

       41
       41
       -
               children.fail("cowsay hey")

     

       42
       42
       -
               children.succeed("hello")

     

       43
       43
       -
         '';

     

       44
       44
       -
       }

+2 -2

nixos/tests/nginx-etag.nix

···

       19
       19
        
               '';

     

       20
       20
        
             };

     

       21
       21
        
       

     

       22
       22
       -
             nesting.clone = lib.singleton {

     

       22
       22
       +
             specialisation.pass-checks.configuration = {

     

       23
       23
        
               services.nginx.virtualHosts.server = {

     

       24
       24
        
                 root = lib.mkForce (pkgs.runCommandLocal "testdir2" {} ''

     

       25
       25
        
                   mkdir "$out"

     
···

       70
       70
        
       

     

       71
       71
        
         testScript = { nodes, ... }: let

     

       72
       72
        
           inherit (nodes.server.config.system.build) toplevel;

     

       73
       73
       -
           newSystem = "${toplevel}/fine-tune/child-1";

     

       73
       73
       +
           newSystem = "${toplevel}/specialisation/pass-checks";

     

       74
       74
        
         in ''

     

       75
       75
        
           start_all()

     

       76
       76

+22 -25

nixos/tests/nginx.nix

···

       42
       42
        
       

     

       43
       43
        
             services.nginx.enableReload = true;

     

       44
       44
        
       

     

       45
       45
       -
             nesting.clone = [

     

       46
       46
       -
               {

     

       47
       47
       -
                 services.nginx.virtualHosts.localhost = {

     

       48
       48
       -
                   root = lib.mkForce (pkgs.runCommand "testdir2" {} ''

     

       49
       49
       -
                     mkdir "$out"

     

       50
       50
       -
                     echo content changed > "$out/index.html"

     

       51
       51
       -
                   '');

     

       52
       52
       -
                 };

     

       53
       53
       -
               }

     

       45
       45
       +
             specialisation.etagSystem.configuration = {

     

       46
       46
       +
               services.nginx.virtualHosts.localhost = {

     

       47
       47
       +
                 root = lib.mkForce (pkgs.runCommand "testdir2" {} ''

     

       48
       48
       +
                   mkdir "$out"

     

       49
       49
       +
                   echo content changed > "$out/index.html"

     

       50
       50
       +
                 '');

     

       51
       51
       +
               };

     

       52
       52
       +
             };

     

       54
       53
        
       

     

       55
       55
       -
               {

     

       56
       56
       -
                 services.nginx.virtualHosts."1.my.test".listen = [ { addr = "127.0.0.1"; port = 8080; }];

     

       57
       57
       -
               }

     

       54
       54
       +
             specialisation.justReloadSystem.configuration = {

     

       55
       55
       +
               services.nginx.virtualHosts."1.my.test".listen = [ { addr = "127.0.0.1"; port = 8080; }];

     

       56
       56
       +
             };

     

       58
       57
        
       

     

       59
       59
       -
               {

     

       60
       60
       -
                 services.nginx.package = pkgs.nginxUnstable;

     

       61
       61
       -
               }

     

       58
       58
       +
             specialisation.reloadRestartSystem.configuration = {

     

       59
       59
       +
               services.nginx.package = pkgs.nginxUnstable;

     

       60
       60
       +
             };

     

       62
       61
        
       

     

       63
       63
       -
               {

     

       64
       64
       -
                 services.nginx.package = pkgs.nginxUnstable;

     

       65
       65
       -
                 services.nginx.virtualHosts."!@$$(#*%".locations."~@#*$*!)".proxyPass = ";;;";

     

       66
       66
       -
               }

     

       67
       67
       -
             ];

     

       62
       62
       +
             specialisation.reloadWithErrorsSystem.configuration = {

     

       63
       63
       +
               services.nginx.package = pkgs.nginxUnstable;

     

       64
       64
       +
               services.nginx.virtualHosts."!@$$(#*%".locations."~@#*$*!)".proxyPass = ";;;";

     

       65
       65
       +
             };

     

       68
       66
        
           };

     

       69
       69
       -
       

     

       70
       67
        
         };

     

       71
       68
        
       

     

       72
       69
        
         testScript = { nodes, ... }: let

     

       73
       73
       -
           etagSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-1";

     

       74
       74
       -
           justReloadSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-2";

     

       75
       75
       -
           reloadRestartSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-3";

     

       76
       76
       -
           reloadWithErrorsSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-4";

     

       70
       70
       +
           etagSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/etagSystem";

     

       71
       71
       +
           justReloadSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/justReloadSystem";

     

       72
       72
       +
           reloadRestartSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/reloadRestartSystem";

     

       73
       73
       +
           reloadWithErrorsSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/reloadWithErrorsSystem";

     

       77
       74
        
         in ''

     

       78
       75
        
           url = "http://localhost/index.html"

     

       79
       76

+43

nixos/tests/specialisation.nix

···

       1
       1
       +
       import ./make-test-python.nix {

     

       2
       2
       +
         name = "specialisation";

     

       3
       3
       +
         nodes =  {

     

       4
       4
       +
           inheritconf = { pkgs, ... }: {

     

       5
       5
       +
             environment.systemPackages = [ pkgs.cowsay ];

     

       6
       6
       +
             specialisation.inheritconf.configuration = { pkgs, ... }: {

     

       7
       7
       +
               environment.systemPackages = [ pkgs.hello ];

     

       8
       8
       +
             };

     

       9
       9
       +
           };

     

       10
       10
       +
           noinheritconf = { pkgs, ... }: {

     

       11
       11
       +
             environment.systemPackages = [ pkgs.cowsay ];

     

       12
       12
       +
             specialisation.noinheritconf = {

     

       13
       13
       +
               inheritParentConfig = false;

     

       14
       14
       +
               configuration = { pkgs, ... }: {

     

       15
       15
       +
                 environment.systemPackages = [ pkgs.hello ];

     

       16
       16
       +
               };

     

       17
       17
       +
             };

     

       18
       18
       +
           };

     

       19
       19
       +
         };

     

       20
       20
       +
         testScript = ''

     

       21
       21
       +
           inheritconf.wait_for_unit("default.target")

     

       22
       22
       +
           inheritconf.succeed("cowsay hey")

     

       23
       23
       +
           inheritconf.fail("hello")

     

       24
       24
       +
       

     

       25
       25
       +
           with subtest("Nested clones do inherit from parent"):

     

       26
       26
       +
               inheritconf.succeed(

     

       27
       27
       +
                   "/run/current-system/specialisation/inheritconf/bin/switch-to-configuration test"

     

       28
       28
       +
               )

     

       29
       29
       +
               inheritconf.succeed("cowsay hey")

     

       30
       30
       +
               inheritconf.succeed("hello")

     

       31
       31
       +
       

     

       32
       32
       +
               noinheritconf.wait_for_unit("default.target")

     

       33
       33
       +
               noinheritconf.succeed("cowsay hey")

     

       34
       34
       +
               noinheritconf.fail("hello")

     

       35
       35
       +
       

     

       36
       36
       +
           with subtest("Nested children do not inherit from parent"):

     

       37
       37
       +
               noinheritconf.succeed(

     

       38
       38
       +
                   "/run/current-system/specialisation/noinheritconf/bin/switch-to-configuration test"

     

       39
       39
       +
               )

     

       40
       40
       +
               noinheritconf.fail("cowsay hey")

     

       41
       41
       +
               noinheritconf.succeed("hello")

     

       42
       42
       +
         '';

     

       43
       43
       +
       }