commit 88bb9fa4037c7cda4cb2fb94792d17e44fd55a18 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/backup/automysqlbackup.nix

···

       41
       41
        
             };

     

       42
       42
        
       

     

       43
       43
        
             config = mkOption {

     

       44
       44
       -
               type = with types; attrsOf (either (either str (either int bool)) (listOf str));

     

       44
       44
       +
               type = with types; attrsOf (oneOf [ str int bool (listOf str) ]);

     

       45
       45
        
               default = {};

     

       46
       46
        
               description = ''

     

       47
       47
        
                 automysqlbackup configuration. Refer to

+1 -1

nixos/modules/services/games/minecraft-server.nix

···

       118
       118
        
             };

     

       119
       119
        
       

     

       120
       120
        
             serverProperties = mkOption {

     

       121
       121
       -
               type = with types; attrsOf (either bool (either int str));

     

       121
       121
       +
               type = with types; attrsOf (oneOf [ bool int str ]);

     

       122
       122
        
               default = {};

     

       123
       123
        
               example = literalExample ''

     

       124
       124
        
                 {

+1 -1

nixos/modules/services/mail/davmail.nix

···

       7
       7
        
         cfg = config.services.davmail;

     

       8
       8
        
       

     

       9
       9
        
         configType = with types;

     

       10
       10
       -
           either (either (attrsOf configType) str) (either int bool) // {

     

       10
       10
       +
           oneOf [ (attrsOf configType) str int bool ] // {

     

       11
       11
        
             description = "davmail config type (str, int, bool or attribute set thereof)";

     

       12
       12
        
           };

     

       13
       13

+1 -1

nixos/modules/services/mail/postfix.nix

···

       447
       447
        
             };

     

       448
       448
        
       

     

       449
       449
        
             config = mkOption {

     

       450
       450
       -
               type = with types; attrsOf (either bool (either str (listOf str)));

     

       450
       450
       +
               type = with types; attrsOf (oneOf [ bool str (listOf str) ]);

     

       451
       451
        
               description = ''

     

       452
       452
        
                 The main.cf configuration file as key value set.

     

       453
       453
        
               '';

+1 -1

nixos/modules/services/mail/rspamd.nix

···

       331
       331
        
               };

     

       332
       332
        
       

     

       333
       333
        
               config = mkOption {

     

       334
       334
       -
                 type = with types; attrsOf (either bool (either str (listOf str)));

     

       334
       334
       +
                 type = with types; attrsOf (oneOf [ bool str (listOf str) ]);

     

       335
       335
        
                 description = ''

     

       336
       336
        
                   Addon to postfix configuration

     

       337
       337
        
                 '';

+1 -1

nixos/modules/services/mail/rss2email.nix

···

       30
       30
        
             };

     

       31
       31
        
       

     

       32
       32
        
             config = mkOption {

     

       33
       33
       -
               type = with types; attrsOf (either str (either int bool));

     

       33
       33
       +
               type = with types; attrsOf (oneOf [ str int bool ]);

     

       34
       34
        
               default = {};

     

       35
       35
        
               description = ''

     

       36
       36
        
                 The configuration to give rss2email.

+2 -2

nixos/modules/services/networking/znc/default.nix

···

       62
       62
        
             concatStringsSep "\n" (toLines cfg.config);

     

       63
       63
        
       

     

       64
       64
        
         semanticTypes = with types; rec {

     

       65
       65
       -
           zncAtom = nullOr (either (either int bool) str);

     

       65
       65
       +
           zncAtom = nullOr (oneOf [ int bool str ]);

     

       66
       66
        
           zncAttr = attrsOf (nullOr zncConf);

     

       67
       67
       -
           zncAll = either (either zncAtom (listOf zncAtom)) zncAttr;

     

       67
       67
       +
           zncAll = oneOf [ zncAtom (listOf zncAtom) zncAttr ];

     

       68
       68
        
           zncConf = attrsOf (zncAll // {

     

       69
       69
        
             # Since this is a recursive type and the description by default contains

     

       70
       70
        
             # the description of its subtypes, infinite recursion would occur without

+1 -1

nixos/modules/services/security/bitwarden_rs/default.nix

···

       36
       36
        
           };

     

       37
       37
        
       

     

       38
       38
        
           config = mkOption {

     

       39
       39
       -
             type = attrsOf (nullOr (either (either bool int) str));

     

       39
       39
       +
             type = attrsOf (nullOr (oneOf [ bool int str ]));

     

       40
       40
        
             default = {};

     

       41
       41
        
             example = literalExample ''

     

       42
       42
        
               {

+1 -1

nixos/modules/services/web-apps/limesurvey.nix

···

       14
       14
        
       

     

       15
       15
        
         pkg = pkgs.limesurvey;

     

       16
       16
        
       

     

       17
       17
       -
         configType = with types; either (either (attrsOf configType) str) (either int bool) // {

     

       17
       17
       +
         configType = with types; oneOf [ (attrsOf configType) str int bool ] // {

     

       18
       18
        
           description = "limesurvey config type (str, int, bool or attribute set thereof)";

     

       19
       19
        
         };

     

       20
       20

+1 -1

nixos/modules/services/x11/compton.nix

···

       215
       215
        
           };

     

       216
       216
        
       

     

       217
       217
        
           settings = let

     

       218
       218
       -
             configTypes = with types; either bool (either int (either float str));

     

       218
       218
       +
             configTypes = with types; oneOf [ bool int float str ];

     

       219
       219
        
             # types.loaOf converts lists to sets

     

       220
       220
        
             loaOf = t: with types; either (listOf t) (attrsOf t);

     

       221
       221
        
           in mkOption {

+1 -1

nixos/modules/system/boot/systemd-unit-options.nix

···

       226
       226
        
       

     

       227
       227
        
           environment = mkOption {

     

       228
       228
        
             default = {};

     

       229
       229
       -
             type = with types; attrsOf (nullOr (either str (either path package)));

     

       229
       229
       +
             type = with types; attrsOf (nullOr (oneOf [ str path package ]));

     

       230
       230
        
             example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };

     

       231
       231
        
             description = "Environment variables passed to the service's processes.";

     

       232
       232
        
           };

+1 -1

nixos/modules/system/boot/systemd.nix

···

       520
       520
        
           };

     

       521
       521
        
       

     

       522
       522
        
           systemd.globalEnvironment = mkOption {

     

       523
       523
       -
             type = with types; attrsOf (nullOr (either str (either path package)));

     

       523
       523
       +
             type = with types; attrsOf (nullOr (oneOf [ str path package ]));

     

       524
       524
        
             default = {};

     

       525
       525
        
             example = { TZ = "CET"; };

     

       526
       526
        
             description = ''