commit 7b15d6cee4839c5ef2e3a9fea355b6007f008820 · pyrox.dev/nixpkgs

+6

nixos/lib/eval-config.nix

···

       41
       41
        
             # default to the argument. That way this new default could propagate all

     

       42
       42
        
             # they way through, but has the last priority behind everything else.

     

       43
       43
        
             nixpkgs.system = lib.mkDefault system;

     

       44
       44
       +
       

     

       45
       45
       +
             # Stash the value of the `system` argument. When using `nesting.children`

     

       46
       46
       +
             # we want to have the same default value behavior (immediately above)

     

       47
       47
       +
             # without any interference from the user's configuration.

     

       48
       48
       +
             nixpkgs.initialSystem = system;

     

       49
       49
       +
       

     

       44
       50
        
             _module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_);

     

       45
       51
        
           };

     

       46
       52
        
         };

+8

nixos/modules/misc/nixpkgs.nix

···

       216
       216
        
               Ignored when <code>nixpkgs.pkgs</code> is set.

     

       217
       217
        
             '';

     

       218
       218
        
           };

     

       219
       219
       +
       

     

       220
       220
       +
           initialSystem = mkOption {

     

       221
       221
       +
             type = types.str;

     

       222
       222
       +
             internal = true;

     

       223
       223
       +
             description = ''

     

       224
       224
       +
               Preserved value of <literal>system</literal> passed to <literal>eval-config.nix</literal>.

     

       225
       225
       +
             '';

     

       226
       226
       +
           };

     

       219
       227
        
         };

     

       220
       228
        
       

     

       221
       229
        
         config = {

+1

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

···

       15
       15
        
           map (childConfig:

     

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

     

       17
       17
        
               inherit baseModules;

     

       18
       18
       +
               system = config.nixpkgs.initialSystem;

     

       18
       19
        
               modules =

     

       19
       20
        
                  (optionals inheritParent modules)

     

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

+4 -4

nixos/tests/nesting.nix

···

       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")

     

       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(