commit 90162e8113546e3d16f1b8dead39f3ba7fee6c43 · pyrox.dev/nixpkgs

+11 -1

nixos/doc/manual/default.nix

···

       25
       25
        
           escapeShellArg

     

       26
       26
        
           concatMapStringsSep

     

       27
       27
        
           sourceFilesBySuffices

     

       28
       28
       +
           modules

     

       28
       29
        
           ;

     

       29
       30
        
       

     

       30
       31
        
         common = import ./common.nix;

     
···

       129
       130
        
         '';

     

       130
       131
        
       

     

       131
       132
        
         portableServiceOptions = buildPackages.nixosOptionsDoc {

     

       132
       132
       -
           inherit (evalModules { modules = [ ../../modules/system/service/portable/service.nix ]; }) options;

     

       133
       133
       +
           inherit

     

       134
       134
       +
             (evalModules {

     

       135
       135
       +
               modules = [

     

       136
       136
       +
                 (modules.importApply ../../modules/system/service/portable/service.nix {

     

       137
       137
       +
                   pkgs = throw "nixos docs / portableServiceOptions: Do not reference pkgs in docs";

     

       138
       138
       +
                 })

     

       139
       139
       +
               ];

     

       140
       140
       +
             })

     

       141
       141
       +
             options

     

       142
       142
       +
             ;

     

       133
       143
        
           inherit revision warningsAreErrors;

     

       134
       144
        
           transformOptions =

     

       135
       145
        
             opt:

+45 -1

nixos/modules/system/service/portable/lib.nix

···

       1
       1
        
       { lib, ... }:

     

       2
       2
        
       let

     

       3
       3
       -
         inherit (lib) concatLists mapAttrsToList showOption;

     

       3
       3
       +
         inherit (lib)

     

       4
       4
       +
           concatLists

     

       5
       5
       +
           mapAttrsToList

     

       6
       6
       +
           showOption

     

       7
       7
       +
           types

     

       8
       8
       +
           ;

     

       4
       9
        
       in

     

       5
       10
        
       rec {

     

       6
       11
        
         flattenMapServicesConfigToList =

     
···

       30
       35
        
             assertion = ass.assertion;

     

       31
       36
        
           }) config.assertions

     

       32
       37
        
         );

     

       38
       38
       +
       

     

       39
       39
       +
         /**

     

       40
       40
       +
           This is the entrypoint for the portable part of modular services.

     

       41
       41
       +
       

     

       42
       42
       +
           It provides the various options that are consumed by service manager implementations.

     

       43
       43
       +
       

     

       44
       44
       +
           # Inputs

     

       45
       45
       +
       

     

       46
       46
       +
           `serviceManagerPkgs`: A Nixpkgs instance which will be used for built-in logic such as converting `configData.<path>.text` to a store path.

     

       47
       47
       +
       

     

       48
       48
       +
           `extraRootModules`: Modules to be loaded into the "root" service submodule, but not into its sub-`services`. That's the modules' own responsibility.

     

       49
       49
       +
       

     

       50
       50
       +
           `extraRootSpecialArgs`: Fixed module arguments that are provided in a similar manner to `extraRootModules`.

     

       51
       51
       +
       

     

       52
       52
       +
           # Output

     

       53
       53
       +
       

     

       54
       54
       +
           An attribute set.

     

       55
       55
       +
       

     

       56
       56
       +
           `serviceSubmodule`: a Module System option type which is a `submodule` with the portable modules and this function's inputs loaded into it.

     

       57
       57
       +
         */

     

       58
       58
       +
         configure =

     

       59
       59
       +
           {

     

       60
       60
       +
             serviceManagerPkgs,

     

       61
       61
       +
             extraRootModules ? [ ],

     

       62
       62
       +
             extraRootSpecialArgs ? { },

     

       63
       63
       +
           }:

     

       64
       64
       +
           let

     

       65
       65
       +
             modules = [

     

       66
       66
       +
               (lib.modules.importApply ./service.nix { pkgs = serviceManagerPkgs; })

     

       67
       67
       +
             ];

     

       68
       68
       +
             serviceSubmodule = types.submoduleWith {

     

       69
       69
       +
               class = "service";

     

       70
       70
       +
               modules = modules ++ extraRootModules;

     

       71
       71
       +
               specialArgs = extraRootSpecialArgs;

     

       72
       72
       +
             };

     

       73
       73
       +
           in

     

       74
       74
       +
           {

     

       75
       75
       +
             inherit serviceSubmodule;

     

       76
       76
       +
           };

     

       33
       77
        
       }

+8 -1

nixos/modules/system/service/portable/service.nix

···

       1
       1
       +
       # Non-module arguments

     

       2
       2
       +
       # These are separate from the module arguments to avoid implicit dependencies.

     

       3
       3
       +
       # This makes service modules self-contains, allowing mixing of Nixpkgs versions.

     

       4
       4
       +
       { pkgs }:

     

       5
       5
       +
       

     

       6
       6
       +
       # The module

     

       1
       7
        
       {

     

       2
       8
        
         lib,

     

       3
       9
        
         ...

     
···

       11
       17
        
         _class = "service";

     

       12
       18
        
         imports = [

     

       13
       19
        
           ../../../misc/assertions.nix

     

       20
       20
       +
           (lib.modules.importApply ./config-data.nix { inherit pkgs; })

     

       14
       21
        
         ];

     

       15
       22
        
         options = {

     

       16
       23
        
           services = mkOption {

     

       17
       24
        
             type = types.attrsOf (

     

       18
       25
        
               types.submoduleWith {

     

       19
       26
        
                 modules = [

     

       20
       20
       -
                   ./service.nix

     

       27
       27
       +
                   (lib.modules.importApply ./service.nix { inherit pkgs; })

     

       21
       28
        
                 ];

     

       22
       29
        
               }

     

       23
       30
        
             );

+3 -1

nixos/modules/system/service/systemd/service.nix

···

       52
       52
        
       

     

       53
       53
        
       in

     

       54
       54
        
       {

     

       55
       55
       +
         _class = "service";

     

       55
       56
        
         imports = [

     

       56
       56
       -
           ../portable/service.nix

     

       57
       57
        
           (lib.mkAliasOptionModule [ "systemd" "service" ] [ "systemd" "services" "" ])

     

       58
       58
        
           (lib.mkAliasOptionModule [ "systemd" "socket" ] [ "systemd" "sockets" "" ])

     

       59
       59
        
         ];

     
···

       101
       101
        
                 };

     

       102
       102
        
               }

     

       103
       103
        
             );

     

       104
       104
       +
             # Rendered by the portable docs instead.

     

       105
       105
       +
             visible = false;

     

       104
       106
        
           };

     

       105
       107
        
         };

     

       106
       108
        
         config = {

+14 -27

nixos/modules/system/service/systemd/system.nix

···

       59
       59
        
           // concatMapAttrs (

     

       60
       60
        
             subServiceName: subService: makeUnits unitType (dash prefix subServiceName) subService

     

       61
       61
        
           ) service.services;

     

       62
       62
       +
       

     

       63
       63
       +
         modularServiceConfiguration = portable-lib.configure {

     

       64
       64
       +
           serviceManagerPkgs = pkgs;

     

       65
       65
       +
           extraRootModules = [

     

       66
       66
       +
             ./service.nix

     

       67
       67
       +
             ./config-data-path.nix

     

       68
       68
       +
           ];

     

       69
       69
       +
           extraRootSpecialArgs = {

     

       70
       70
       +
             systemdPackage = config.systemd.package;

     

       71
       71
       +
           };

     

       72
       72
       +
         };

     

       62
       73
        
       in

     

       63
       74
        
       {

     

       75
       75
       +
         _class = "nixos";

     

       76
       76
       +
       

     

       64
       77
        
         # First half of the magic: mix systemd logic into the otherwise abstract services

     

       65
       78
        
         options = {

     

       66
       79
        
           system.services = mkOption {

     

       67
       80
        
             description = ''

     

       68
       81
        
               A collection of NixOS [modular services](https://nixos.org/manual/nixos/unstable/#modular-services) that are configured as systemd services.

     

       69
       82
        
             '';

     

       70
       70
       -
             type = types.attrsOf (

     

       71
       71
       -
               types.submoduleWith {

     

       72
       72
       -
                 class = "service";

     

       73
       73
       -
                 modules = [

     

       74
       74
       -
                   ./service.nix

     

       75
       75
       -
                   ./config-data-path.nix

     

       76
       76
       -
                   (lib.modules.importApply ../portable/config-data.nix { inherit pkgs; })

     

       77
       77
       -
       

     

       78
       78
       -
                   {

     

       79
       79
       -
                     # Extend portable services option

     

       80
       80
       -
                     options.services = lib.mkOption {

     

       81
       81
       -
                       type = types.attrsOf (

     

       82
       82
       -
                         types.submoduleWith {

     

       83
       83
       -
                           modules = [

     

       84
       84
       -
                             (lib.modules.importApply ../portable/config-data.nix { inherit pkgs; })

     

       85
       85
       -
                           ];

     

       86
       86
       -
                         }

     

       87
       87
       -
                       );

     

       88
       88
       -
                     };

     

       89
       89
       -
                   }

     

       90
       90
       -
                 ];

     

       91
       91
       -
                 specialArgs = {

     

       92
       92
       -
                   # perhaps: features."systemd" = { };

     

       93
       93
       -
                   systemdPackage = config.systemd.package;

     

       94
       94
       -
                 };

     

       95
       95
       -
               }

     

       96
       96
       -
             );

     

       83
       83
       +
             type = types.attrsOf modularServiceConfiguration.serviceSubmodule;

     

       97
       84
        
             default = { };

     

       98
       85
        
             visible = "shallow";

     

       99
       86
        
           };