commit 0bef0c38f74372ca1794e800b8709b90558efba2 · pyrox.dev/nixpkgs

+1 -1

lib/default.nix

···

       119
       119
        
             mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions

     

       120
       120
        
             mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule

     

       121
       121
        
             mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule

     

       122
       122
       -
             mkAliasOptionModule doRename;

     

       122
       122
       +
             mkAliasOptionModule mkDerivedConfig doRename;

     

       123
       123
        
           inherit (self.options) isOption mkEnableOption mkSinkUndeclaredOptions

     

       124
       124
        
             mergeDefaultOption mergeOneOption mergeEqualOption getValues

     

       125
       125
        
             getFiles optionAttrSetToDocList optionAttrSetToDocList'

+20

lib/modules.nix

···

       956
       956
        
           use = id;

     

       957
       957
        
         };

     

       958
       958
        
       

     

       959
       959
       +
         /* mkDerivedConfig : Option a -> (a -> Definition b) -> Definition b

     

       960
       960
       +
       

     

       961
       961
       +
           Create config definitions with the same priority as the definition of another option.

     

       962
       962
       +
           This should be used for option definitions where one option sets the value of another as a convenience.

     

       963
       963
       +
           For instance a config file could be set with a `text` or `source` option, where text translates to a `source`

     

       964
       964
       +
           value using `mkDerivedConfig options.text (pkgs.writeText "filename.conf")`.

     

       965
       965
       +
       

     

       966
       966
       +
           It takes care of setting the right priority using `mkOverride`.

     

       967
       967
       +
         */

     

       968
       968
       +
         # TODO: make the module system error message include information about `opt` in

     

       969
       969
       +
         # error messages about conflicts. E.g. introduce a variation of `mkOverride` which

     

       970
       970
       +
         # adds extra location context to the definition object. This will allow context to be added

     

       971
       971
       +
         # to all messages that report option locations "this value was derived from <full option name>

     

       972
       972
       +
         # which was defined in <locations>". It can provide a trace of options that contributed

     

       973
       973
       +
         # to definitions.

     

       974
       974
       +
         mkDerivedConfig = opt: f:

     

       975
       975
       +
           mkOverride

     

       976
       976
       +
             (opt.highestPrio or defaultPriority)

     

       977
       977
       +
             (f opt.value);

     

       978
       978
       +
       

     

       959
       979
        
         doRename = { from, to, visible, warn, use, withPriority ? true }:

     

       960
       980
        
           { config, options, ... }:

     

       961
       981
        
           let

+2 -3

nixos/modules/system/etc/etc.nix

···

       172
       172
        
                   target = mkDefault name;

     

       173
       173
        
                   source = mkIf (config.text != null) (

     

       174
       174
        
                     let name' = "etc-" + baseNameOf name;

     

       175
       175
       -
                     in mkOverride

     

       176
       176
       -
                       (options.text.highestPrio or lib.modules.defaultPriority)

     

       177
       177
       -
                       (pkgs.writeText name' config.text));

     

       175
       175
       +
                     in mkDerivedConfig options.text (pkgs.writeText name')

     

       176
       176
       +
                   );

     

       178
       177
        
                 };

     

       179
       178
        
       

     

       180
       179
        
               }));