commit 33daa3f4b9104b55d11740277d0182cb23fcde07 · pyrox.dev/nixpkgs

-2

lib/modules.nix

···

       1177
       1177
        
             map (mapAttrs (n: v: mkIf cfg.condition v)) (pushDownProperties cfg.content)

     

       1178
       1178
        
           else if cfg._type or "" == "override" then

     

       1179
       1179
        
             map (mapAttrs (n: v: mkOverride cfg.priority v)) (pushDownProperties cfg.content)

     

       1180
       1180
       -
           # else if cfg._type or "" == "definition" then

     

       1181
       1181
       -
           #   map (mapAttrs (n: v: mkDefinition v)) (pushDownProperties cfg.content)

     

       1182
       1180
        
           # FIXME: handle mkOrder?

     

       1183
       1181
        
           else

     

       1184
       1182
        
             [ cfg ];

lib/tests/modules.sh

···

       673
       673
        
       # types.pathWith { inStore = true; absolute = false; }

     

       674
       674
        
       checkConfigError 'In pathWith, inStore means the path must be absolute' config.impossiblePathOptionType ./pathWith.nix

     

       675
       675
        
       

     

       676
       676
       +
       # mkDefinition

     

       677
       677
       +
       # check that mkDefinition 'file' is printed in the error message

     

       678
       678
       +
       checkConfigError 'Cannot merge definitions.*\n\s*- In .file.*\n\s*- In .other.*' config.conflict ./mkDefinition.nix

     

       679
       679
       +
       checkConfigError 'A definition for option .viaOptionDefault. is not of type .boolean.*' config.viaOptionDefault ./mkDefinition.nix

     

       680
       680
       +
       checkConfigOutput '^true$' config.viaConfig ./mkDefinition.nix

     

       681
       681
       +
       checkConfigOutput '^true$' config.mkMerge ./mkDefinition.nix

     

       682
       682
       +
       checkConfigOutput '^true$' config.mkForce ./mkDefinition.nix

     

       683
       683
       +
       

     

       676
       684
        
       cat <<EOF

     

       677
       685
        
       ====== module tests ======

     

       678
       686
        
       $pass Pass

+71

lib/tests/modules/mkDefinition.nix

···

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       let

     

       3
       3
       +
         inherit (lib)

     

       4
       4
       +
           mkOption

     

       5
       5
       +
           mkDefinition

     

       6
       6
       +
           mkOptionDefault

     

       7
       7
       +
           ;

     

       8
       8
       +
       in

     

       9
       9
       +
       {

     

       10
       10
       +
         imports = [

     

       11
       11
       +
           {

     

       12
       12
       +
             _file = "file";

     

       13
       13
       +
             options.conflict = mkOption {

     

       14
       14
       +
               default = 1;

     

       15
       15
       +
             };

     

       16
       16
       +
             config.conflict = mkDefinition {

     

       17
       17
       +
               file = "other";

     

       18
       18
       +
               value = mkOptionDefault 42;

     

       19
       19
       +
             };

     

       20
       20
       +
           }

     

       21
       21
       +
           {

     

       22
       22
       +
             # Check that mkDefinition works within 'config'

     

       23
       23
       +
             options.viaConfig = mkOption { };

     

       24
       24
       +
             config.viaConfig = mkDefinition {

     

       25
       25
       +
               file = "other";

     

       26
       26
       +
               value = true;

     

       27
       27
       +
             };

     

       28
       28
       +
           }

     

       29
       29
       +
           {

     

       30
       30
       +
             # Check mkMerge can wrap mkDefinitions

     

       31
       31
       +
             # Not the other way around

     

       32
       32
       +
             options.mkMerge = mkOption {

     

       33
       33
       +
               type = lib.types.bool;

     

       34
       34
       +
             };

     

       35
       35
       +
             config.mkMerge = lib.mkMerge [

     

       36
       36
       +
               (mkDefinition {

     

       37
       37
       +
                 file = "a.nix";

     

       38
       38
       +
                 value = true;

     

       39
       39
       +
               })

     

       40
       40
       +
               (mkDefinition {

     

       41
       41
       +
                 file = "b.nix";

     

       42
       42
       +
                 value = true;

     

       43
       43
       +
               })

     

       44
       44
       +
             ];

     

       45
       45
       +
           }

     

       46
       46
       +
           {

     

       47
       47
       +
             # Check mkDefinition can use mkForce on the value

     

       48
       48
       +
             # Not the other way around

     

       49
       49
       +
             options.mkForce = mkOption {

     

       50
       50
       +
               type = lib.types.bool;

     

       51
       51
       +
               default = false;

     

       52
       52
       +
             };

     

       53
       53
       +
             config.mkForce = mkDefinition {

     

       54
       54
       +
               file = "other";

     

       55
       55
       +
               value = lib.mkForce true;

     

       56
       56
       +
             };

     

       57
       57
       +
           }

     

       58
       58
       +
           {

     

       59
       59
       +
             # Currently expects an error

     

       60
       60
       +
             # mkDefinition doesn't work on option default

     

       61
       61
       +
             # This is a limitation and might be resolved in the future

     

       62
       62
       +
             options.viaOptionDefault = mkOption {

     

       63
       63
       +
               type = lib.types.bool;

     

       64
       64
       +
               default = mkDefinition {

     

       65
       65
       +
                 file = "other";

     

       66
       66
       +
                 value = true;

     

       67
       67
       +
               };

     

       68
       68
       +
             };

     

       69
       69
       +
           }

     

       70
       70
       +
         ];

     

       71
       71
       +
       }

+19 -1

nixos/doc/manual/development/option-def.section.md

···

       139
       139
        
       

     

       140
       140
        
       Preserving the file location creates better error messages, for example when copying definitions from one option to another.

     

       141
       141
        
       

     

       142
       142
       -
       Other properties like `mkOverride` `mkMerge` `mkAfter` can be used in the `value` attribute but not the other way around.

     

       142
       142
       +
       Other properties like `mkOverride` `mkMerge` `mkAfter` can be used in the `value` attribute but not on the entire definition.

     

       143
       143
       +
       

     

       144
       144
       +
       This is what would work

     

       145
       145
       +
       

     

       146
       146
       +
       ```nix

     

       147
       147
       +
       mkDefinition {

     

       148
       148
       +
          value = mkForce 42;

     

       149
       149
       +
          file = "somefile.nix";

     

       150
       150
       +
       }

     

       151
       151
       +
       ```

     

       152
       152
       +
       

     

       153
       153
       +
       While this would NOT work.

     

       154
       154
       +
       

     

       155
       155
       +
       ```nix

     

       156
       156
       +
       mkForce (mkDefinition {

     

       157
       157
       +
          value = 42;

     

       158
       158
       +
          file = "somefile.nix";

     

       159
       159
       +
       })

     

       160
       160
       +
       ```

     

       143
       161
        
       

     

       144
       162
        
       The following shows an example configuration that yields an error with the custom position information:

     

       145
       163