commit f659db7ba28e8474df72cb505c790ff2cf92c1a4 · pyrox.dev/nixpkgs

+21 -1

nixos/lib/testing/nodes.nix

···

       1
       1
        
       testModuleArgs@{ config, lib, hostPkgs, nodes, ... }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         inherit (lib) mkOption mkForce optional types mapAttrs mkDefault mdDoc;

     

       4
       4
       +
         inherit (lib) mkOption mkForce optional types mapAttrs mkDefault mkIf mdDoc;

     

       5
       5
        
       

     

       6
       6
        
         baseOS =

     

       7
       7
        
           import ../eval-config.nix {

     
···

       72
       72
        
             default = { };

     

       73
       73
        
           };

     

       74
       74
        
       

     

       75
       75
       +
           node.pkgs = mkOption {

     

       76
       76
       +
             description = mdDoc ''

     

       77
       77
       +
               The Nixpkgs to use for the nodes.

     

       78
       78
       +
       

     

       79
       79
       +
               Setting this will make the `nixpkgs.*` options read-only, to avoid mistakenly testing with a Nixpkgs configuration that diverges from regular use.

     

       80
       80
       +
             '';

     

       81
       81
       +
             type = types.nullOr types.pkgs;

     

       82
       82
       +
             default = null;

     

       83
       83
       +
             defaultText = literalMD ''

     

       84
       84
       +
               `null`, so construct `pkgs` according to the `nixpkgs.*` options as usual.

     

       85
       85
       +
             '';

     

       86
       86
       +
           };

     

       87
       87
       +
       

     

       75
       88
        
           node.specialArgs = mkOption {

     

       76
       89
        
             type = types.lazyAttrsOf types.raw;

     

       77
       90
        
             default = { };

     
···

       104
       117
        
               config.nodes;

     

       105
       118
        
       

     

       106
       119
        
           passthru.nodes = config.nodesCompat;

     

       120
       120
       +
       

     

       121
       121
       +
           defaults = mkIf (config.node.pkgs != null) {

     

       122
       122
       +
             nixpkgs.pkgs = config.node.pkgs;

     

       123
       123
       +
             imports = [ ../../modules/misc/nixpkgs/read-only.nix ];

     

       124
       124
       +
             disabledModules = [{ key = "nodes.nix-pkgs"; }];

     

       125
       125
       +
           };

     

       126
       126
       +
       

     

       107
       127
        
         };

     

       108
       128
        
       }

+1 -5

nixos/tests/all-tests.nix

···

       79
       79
        
           # warnIf pkgs.config.allowAliases "nixosTests: pkgs includes aliases."

     

       80
       80
        
           {

     

       81
       81
        
             _class = "nixosTest";

     

       82
       82
       -
             defaults = {

     

       83
       83
       -
               nixpkgs.pkgs = pkgs;

     

       84
       84
       -
               imports = [ ../modules/misc/nixpkgs/read-only.nix ];

     

       85
       85
       -
               disabledModules = [{ key = "nodes.nix-pkgs"; }];

     

       86
       86
       -
             };

     

       82
       82
       +
             node.pkgs = pkgs;

     

       87
       83
        
           };

     

       88
       84
        
       

     

       89
       85
        
       in {