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-04-04 11:54:46 +0200
commit2e1d470569f5a2a1a9154efdf6f21d12c659631d (patch)
treeef047f50acb4355d39330f06299fcaec8356a9cb /lib
parent4c7d990badc4a6ef9adcffb0790902de94faa51e (diff)
downloadnixlib-2e1d470569f5a2a1a9154efdf6f21d12c659631d.tar
nixlib-2e1d470569f5a2a1a9154efdf6f21d12c659631d.tar.gz
nixlib-2e1d470569f5a2a1a9154efdf6f21d12c659631d.tar.bz2
nixlib-2e1d470569f5a2a1a9154efdf6f21d12c659631d.tar.lz
nixlib-2e1d470569f5a2a1a9154efdf6f21d12c659631d.tar.xz
nixlib-2e1d470569f5a2a1a9154efdf6f21d12c659631d.tar.zst
nixlib-2e1d470569f5a2a1a9154efdf6f21d12c659631d.zip
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 a17307be6e07..c33a4d0eb075 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -128,7 +128,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
@@ -138,6 +138,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 0c484fa684aa..93f892bd28c1 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -1307,7 +1307,6 @@ let
       inherit
         applyModuleArgsIfFunction
         dischargeProperties
-        evalOptionValue
         mergeModules
         mergeModules'
         pushDownProperties
@@ -1328,6 +1327,7 @@ private //
     defaultPriority
     doRename
     evalModules
+    evalOptionValue  # for use by lib.types
     filterOverrides
     filterOverrides'
     fixMergeModules