commit 109a6a9d1e13013a4d3e4220d79d0f599a10ac97 · pyrox.dev/nixpkgs

+3 -1

nixos/modules/misc/assertions.nix

···

       32
       32
        
           };

     

       33
       33
        
       

     

       34
       34
        
         };

     

       35
       35
       -
         # impl of assertions is in <nixpkgs/nixos/modules/system/activation/top-level.nix>

     

       35
       35
       +
         # impl of assertions is in

     

       36
       36
       +
         # - <nixpkgs/nixos/modules/system/activation/top-level.nix>

     

       37
       37
       +
         # - <nixpkgs/nixos/modules/system/service/portable/lib.nix>

     

       36
       38
        
       }

+33

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

···

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       let

     

       3
       3
       +
         inherit (lib) concatLists mapAttrsToList showOption;

     

       4
       4
       +
       in

     

       5
       5
       +
       rec {

     

       6
       6
       +
         flattenMapServicesConfigToList =

     

       7
       7
       +
           f: loc: config:

     

       8
       8
       +
           f loc config

     

       9
       9
       +
           ++ concatLists (

     

       10
       10
       +
             mapAttrsToList (

     

       11
       11
       +
               k: v:

     

       12
       12
       +
               flattenMapServicesConfigToList f (

     

       13
       13
       +
                 loc

     

       14
       14
       +
                 ++ [

     

       15
       15
       +
                   "services"

     

       16
       16
       +
                   k

     

       17
       17
       +
                 ]

     

       18
       18
       +
               ) v

     

       19
       19
       +
             ) config.services

     

       20
       20
       +
           );

     

       21
       21
       +
       

     

       22
       22
       +
         getWarnings = flattenMapServicesConfigToList (

     

       23
       23
       +
           loc: config: map (msg: "in ${showOption loc}: ${msg}") config.warnings

     

       24
       24
       +
         );

     

       25
       25
       +
       

     

       26
       26
       +
         getAssertions = flattenMapServicesConfigToList (

     

       27
       27
       +
           loc: config:

     

       28
       28
       +
           map (ass: {

     

       29
       29
       +
             message = "in ${showOption loc}: ${ass.message}";

     

       30
       30
       +
             assertion = ass.assertion;

     

       31
       31
       +
           }) config.assertions

     

       32
       32
       +
         );

     

       33
       33
       +
       }

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

···

       21
       21
        
           };

     

       22
       22
        
       in

     

       23
       23
        
       {

     

       24
       24
       +
         # https://nixos.org/manual/nixos/unstable/#modular-services

     

       25
       25
       +
         _class = "service";

     

       26
       26
       +
         imports = [

     

       27
       27
       +
           ../../../misc/assertions.nix

     

       28
       28
       +
         ];

     

       24
       29
        
         options = {

     

       25
       30
        
           services = mkOption {

     

       26
       31
        
             type = types.attrsOf (

+83 -6

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

···

       5
       5
        
       

     

       6
       6
        
         inherit (lib) mkOption types;

     

       7
       7
        
       

     

       8
       8
       +
         portable-lib = import ./lib.nix { inherit lib; };

     

       9
       9
       +
       

     

       8
       10
        
         dummyPkg =

     

       9
       11
        
           name:

     

       10
       12
        
           derivation {

     
···

       21
       23
        
                 executable = "/usr/bin/echo"; # *giggles*

     

       22
       24
        
                 args = [ "hello" ];

     

       23
       25
        
               };

     

       26
       26
       +
               assertions = [

     

       27
       27
       +
                 {

     

       28
       28
       +
                   assertion = false;

     

       29
       29
       +
                   message = "you can't enable this for that reason";

     

       30
       30
       +
                 }

     

       31
       31
       +
               ];

     

       32
       32
       +
               warnings = [

     

       33
       33
       +
                 "The `foo' service is deprecated and will go away soon!"

     

       34
       34
       +
               ];

     

       24
       35
        
             };

     

       25
       36
        
             service2 = {

     

       26
       37
        
               process = {

     
···

       32
       43
        
             };

     

       33
       44
        
             service3 = {

     

       34
       45
        
               process = {

     

       35
       35
       -
                 executable = dummyPkg "cowsay-ng" // {

     

       36
       36
       -
                   meta.mainProgram = "cowsay";

     

       46
       46
       +
                 executable = "/bin/false";

     

       47
       47
       +
                 args = [ ];

     

       48
       48
       +
               };

     

       49
       49
       +
               services.exclacow = {

     

       50
       50
       +
                 process = {

     

       51
       51
       +
                   executable = dummyPkg "cowsay-ng" // {

     

       52
       52
       +
                     meta.mainProgram = "cowsay";

     

       53
       53
       +
                   };

     

       54
       54
       +
                   args = [ "!" ];

     

       37
       55
        
                 };

     

       38
       38
       -
                 args = [ "!" ];

     

       56
       56
       +
                 assertions = [

     

       57
       57
       +
                   {

     

       58
       58
       +
                     assertion = false;

     

       59
       59
       +
                     message = "you can't enable this for such reason";

     

       60
       60
       +
                   }

     

       61
       61
       +
                 ];

     

       62
       62
       +
                 warnings = [

     

       63
       63
       +
                   "The `bar' service is deprecated and will go away soon!"

     

       64
       64
       +
                 ];

     

       39
       65
        
               };

     

       40
       66
        
             };

     

       41
       67
        
           };

     
···

       69
       95
        
                     args = [ "hello" ];

     

       70
       96
        
                   };

     

       71
       97
        
                   services = { };

     

       98
       98
       +
                   assertions = [

     

       99
       99
       +
                     {

     

       100
       100
       +
                       assertion = false;

     

       101
       101
       +
                       message = "you can't enable this for that reason";

     

       102
       102
       +
                     }

     

       103
       103
       +
                   ];

     

       104
       104
       +
                   warnings = [

     

       105
       105
       +
                     "The `foo' service is deprecated and will go away soon!"

     

       106
       106
       +
                   ];

     

       72
       107
        
                 };

     

       73
       108
        
                 service2 = {

     

       74
       109
        
                   process = {

     
···

       76
       111
        
                     args = [ "world" ];

     

       77
       112
        
                   };

     

       78
       113
        
                   services = { };

     

       114
       114
       +
                   assertions = [ ];

     

       115
       115
       +
                   warnings = [ ];

     

       79
       116
        
                 };

     

       80
       117
        
                 service3 = {

     

       81
       118
        
                   process = {

     

       82
       82
       -
                     executable = "${dummyPkg "cowsay-ng"}/bin/cowsay";

     

       83
       83
       -
                     args = [ "!" ];

     

       119
       119
       +
                     executable = "/bin/false";

     

       120
       120
       +
                     args = [ ];

     

       84
       121
        
                   };

     

       85
       85
       -
                   services = { };

     

       122
       122
       +
                   services.exclacow = {

     

       123
       123
       +
                     process = {

     

       124
       124
       +
                       executable = "${dummyPkg "cowsay-ng"}/bin/cowsay";

     

       125
       125
       +
                       args = [ "!" ];

     

       126
       126
       +
                     };

     

       127
       127
       +
                     services = { };

     

       128
       128
       +
                     assertions = [

     

       129
       129
       +
                       {

     

       130
       130
       +
                         assertion = false;

     

       131
       131
       +
                         message = "you can't enable this for such reason";

     

       132
       132
       +
                       }

     

       133
       133
       +
                     ];

     

       134
       134
       +
                     warnings = [ "The `bar' service is deprecated and will go away soon!" ];

     

       135
       135
       +
                   };

     

       136
       136
       +
                   assertions = [ ];

     

       137
       137
       +
                   warnings = [ ];

     

       86
       138
        
                 };

     

       87
       139
        
               };

     

       88
       140
        
             };

     

       141
       141
       +
       

     

       142
       142
       +
           assert

     

       143
       143
       +
             portable-lib.getWarnings [ "service1" ] exampleEval.config.services.service1 == [

     

       144
       144
       +
               "in service1: The `foo' service is deprecated and will go away soon!"

     

       145
       145
       +
             ];

     

       146
       146
       +
       

     

       147
       147
       +
           assert

     

       148
       148
       +
             portable-lib.getAssertions [ "service1" ] exampleEval.config.services.service1 == [

     

       149
       149
       +
               {

     

       150
       150
       +
                 message = "in service1: you can't enable this for that reason";

     

       151
       151
       +
                 assertion = false;

     

       152
       152
       +
               }

     

       153
       153
       +
             ];

     

       154
       154
       +
       

     

       155
       155
       +
           assert

     

       156
       156
       +
             portable-lib.getWarnings [ "service3" ] exampleEval.config.services.service3 == [

     

       157
       157
       +
               "in service3.services.exclacow: The `bar' service is deprecated and will go away soon!"

     

       158
       158
       +
             ];

     

       159
       159
       +
           assert

     

       160
       160
       +
             portable-lib.getAssertions [ "service3" ] exampleEval.config.services.service3 == [

     

       161
       161
       +
               {

     

       162
       162
       +
                 message = "in service3.services.exclacow: you can't enable this for such reason";

     

       163
       163
       +
                 assertion = false;

     

       164
       164
       +
               }

     

       165
       165
       +
             ];

     

       89
       166
        
       

     

       90
       167
        
           "ok";

     

       91
       168

+23 -1

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

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         config,

     

       4
       4
       +
         options,

     

       4
       5
        
         pkgs,

     

       5
       6
        
         ...

     

       6
       7
        
       }:

     

       7
       8
        
       

     

       8
       9
        
       let

     

       9
       9
       -
         inherit (lib) concatMapAttrs mkOption types;

     

       10
       10
       +
         inherit (lib)

     

       11
       11
       +
           concatMapAttrs

     

       12
       12
       +
           mkOption

     

       13
       13
       +
           types

     

       14
       14
       +
           concatLists

     

       15
       15
       +
           mapAttrsToList

     

       16
       16
       +
           ;

     

       17
       17
       +
       

     

       18
       18
       +
         portable-lib = import ../portable/lib.nix { inherit lib; };

     

       10
       19
        
       

     

       11
       20
        
         dash =

     

       12
       21
        
           before: after:

     
···

       57
       66
        
       

     

       58
       67
        
         # Second half of the magic: siphon units that were defined in isolation to the system

     

       59
       68
        
         config = {

     

       69
       69
       +
       

     

       70
       70
       +
           assertions = concatLists (

     

       71
       71
       +
             mapAttrsToList (

     

       72
       72
       +
               name: cfg: portable-lib.getAssertions (options.system.services.loc ++ [ name ]) cfg

     

       73
       73
       +
             ) config.system.services

     

       74
       74
       +
           );

     

       75
       75
       +
       

     

       76
       76
       +
           warnings = concatLists (

     

       77
       77
       +
             mapAttrsToList (

     

       78
       78
       +
               name: cfg: portable-lib.getWarnings (options.system.services.loc ++ [ name ]) cfg

     

       79
       79
       +
             ) config.system.services

     

       80
       80
       +
           );

     

       81
       81
       +
       

     

       60
       82
        
           systemd.services = concatMapAttrs (

     

       61
       83
        
             serviceName: topLevelService: makeUnits "services" serviceName topLevelService

     

       62
       84
        
           ) config.system.services;