about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2024-01-29 08:58:33 +0100
committerRobert Hensing <robert@roberthensing.nl>2024-05-18 17:50:04 +0200
commitb688f237587825ac3d2949d698a74ec21911630d (patch)
treec4fafe0d5e8bb44b7c52dc0ae01d0e7bc053b84e /lib
parent12044cb4d6b5bbc0d97ea5c4adcdba8c229f22a2 (diff)
lib.modules.evalOptionValue: Undeprecate for lib.types
lib.types.attrTag needs it.
Diffstat (limited to 'lib')
-rw-r--r--lib/default.nix3
-rw-r--r--lib/modules.nix2
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/default.nix b/lib/default.nix
index 35e31af364d88..705119daffa09 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -127,7 +127,7 @@ let
       canCleanSource pathIsGitRepo;
     inherit (self.modules) evalModules setDefaultModuleLocation
       unifyModuleSyntax applyModuleArgsIfFunction mergeModules
-      mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions
+      mergeModules' mergeOptionDecls mergeDefinitions
       pushDownProperties dischargeProperties filterOverrides
       sortProperties fixupOptionType mkIf mkAssert mkMerge mkOverride
       mkOptionDefault mkDefault mkImageMediaOverride mkForce mkVMOverride
@@ -137,6 +137,7 @@ let
       mkMergedOptionModule mkChangedOptionModule
       mkAliasOptionModule mkDerivedConfig doRename
       mkAliasOptionModuleMD;
+    evalOptionValue = lib.warn "External use of `lib.evalOptionValue` is deprecated. If your use case isn't covered by non-deprecated functions, we'd like to know more and perhaps support your use case well, instead of providing access to these low level functions. In this case please open an issue in https://github.com/nixos/nixpkgs/issues/." self.modules.evalOptionValue;
     inherit (self.options) isOption mkEnableOption mkSinkUndeclaredOptions
       mergeDefaultOption mergeOneOption mergeEqualOption mergeUniqueOption
       getValues getFiles
diff --git a/lib/modules.nix b/lib/modules.nix
index 65087e4ca70cb..a120c1b53d61a 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -1305,7 +1305,6 @@ let
       inherit
         applyModuleArgsIfFunction
         dischargeProperties
-        evalOptionValue
         mergeModules
         mergeModules'
         pushDownProperties
@@ -1326,6 +1325,7 @@ private //
     defaultPriority
     doRename
     evalModules
+    evalOptionValue  # for use by lib.types
     filterOverrides
     filterOverrides'
     fixMergeModules