commit 79703eef083d70046873dbb86f08e2ff08f58197 · pyrox.dev/nixpkgs

+4 -1

doc/doc-support/default.nix

···

       45
        
         # NB: This file describes the Nixpkgs manual, which happens to use module

     

       46
        
         #     docs infra originally developed for NixOS.

     

       47
        
         optionsDoc = pkgs.nixosOptionsDoc {

     

       48
       -
           inherit (pkgs.lib.evalModules { modules = [ ../../pkgs/top-level/config.nix ]; }) options;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       49
        
           documentType = "none";

     

       50
        
           transformOptions = opt:

     

       51
        
             opt // {

···

       45
        
         # NB: This file describes the Nixpkgs manual, which happens to use module

     

       46
        
         #     docs infra originally developed for NixOS.

     

       47
        
         optionsDoc = pkgs.nixosOptionsDoc {

     

       48
       +
           inherit (pkgs.lib.evalModules {

     

       49
       +
             modules = [ ../../pkgs/top-level/config.nix ];

     

       50
       +
             specialArgs.class = "nixpkgsConfig";

     

       51
       +
           }) options;

     

       52
        
           documentType = "none";

     

       53
        
           transformOptions = opt:

     

       54
        
             opt // {

+1

nixos/lib/eval-cacheable-options.nix

···

       33
        
           ];

     

       34
        
           specialArgs = {

     

       35
        
             inherit config pkgs utils;

     

       0
        
       
     

       36
        
           };

     

       37
        
         };

     

       38
        
         docs = import "${nixosPath}/doc/manual" {

···

       33
        
           ];

     

       34
        
           specialArgs = {

     

       35
        
             inherit config pkgs utils;

     

       36
       +
             class = "nixos";

     

       37
        
           };

     

       38
        
         };

     

       39
        
         docs = import "${nixosPath}/doc/manual" {

+3 -1

nixos/lib/eval-config-minimal.nix

···

       40
        
           inherit prefix modules;

     

       41
        
           specialArgs = {

     

       42
        
             modulesPath = builtins.toString ../modules;

     

       43
       -
           } // specialArgs;

     

       0
        
       
     

       0
        
       
     

       44
        
         };

     

       45
        
       

     

       46
        
       in

···

       40
        
           inherit prefix modules;

     

       41
        
           specialArgs = {

     

       42
        
             modulesPath = builtins.toString ../modules;

     

       43
       +
           } // specialArgs // {

     

       44
       +
             class = "nixos";

     

       45
       +
           };

     

       46
        
         };

     

       47
        
       

     

       48
        
       in

+4 -1

nixos/lib/testing/default.nix

···

       1
        
       { lib }:

     

       2
        
       let

     

       3
        
       

     

       4
       -
         evalTest = module: lib.evalModules { modules = testModules ++ [ module ]; };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       5
        
         runTest = module: (evalTest ({ config, ... }: { imports = [ module ]; result = config.test; })).config.result;

     

       6
        
       

     

       7
        
         testModules = [

···

       1
        
       { lib }:

     

       2
        
       let

     

       3
        
       

     

       4
       +
         evalTest = module: lib.evalModules {

     

       5
       +
           modules = testModules ++ [ module ];

     

       6
       +
           specialArgs.class = "nixosTest";

     

       7
       +
         };

     

       8
        
         runTest = module: (evalTest ({ config, ... }: { imports = [ module ]; result = config.test; })).config.result;

     

       9
        
       

     

       10
        
         testModules = [

+1

nixos/modules/misc/documentation.nix

···

       39
        
                   _module.check = false;

     

       40
        
                 } ] ++ docModules.eager;

     

       41
        
                 specialArgs = specialArgs // {

     

       0
        
       
     

       42
        
                   pkgs = scrubDerivations "pkgs" pkgs;

     

       43
        
                   # allow access to arbitrary options for eager modules, eg for getting

     

       44
        
                   # option types from lazy modules

···

       39
        
                   _module.check = false;

     

       40
        
                 } ] ++ docModules.eager;

     

       41
        
                 specialArgs = specialArgs // {

     

       42
       +
                   class = "nixos";

     

       43
        
                   pkgs = scrubDerivations "pkgs" pkgs;

     

       44
        
                   # allow access to arbitrary options for eager modules, eg for getting

     

       45
        
                   # option types from lazy modules

+1

pkgs/top-level/default.nix

···

       82
        
               config = config1;

     

       83
        
             })

     

       84
        
           ];

     

       0
        
       
     

       85
        
         };

     

       86
        
       

     

       87
        
         # take all the rest as-is

···

       82
        
               config = config1;

     

       83
        
             })

     

       84
        
           ];

     

       85
       +
           specialArgs.class = "nixpkgsConfig";

     

       86
        
         };

     

       87
        
       

     

       88
        
         # take all the rest as-is