From 2916db79f3920b750c1835753ff8e49785e15d92 Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Sun, 14 Dec 2025 21:30:54 +0100
Subject: [PATCH 1/3] lib/modules: remove silent failure of 'mkAliasIfDef'

---
 lib/modules.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index e545f9c9707d..f52469c9873d 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -1542,7 +1542,7 @@ let
     in
     mkAliasIfDef option (wrap (mkMerge defsWithPrio));
 
-  mkAliasIfDef = option: mkIf (isOption option && option.isDefined);
+  mkAliasIfDef = option: mkIf option.isDefined;
 
   /**
     Compatibility.

From 95afd78e868c9d06ad3d7e013cf4f81ef99507f5 Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Sun, 14 Dec 2025 21:34:12 +0100
Subject: [PATCH 2/3] lib/modules: inline trivial 'mkAliasIfDef'

---
 lib/modules.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index f52469c9873d..bb8faf06c9d6 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -1528,7 +1528,7 @@ let
   # mkDefault properties of the previous option.
   #
   mkAliasDefinitions = mkAliasAndWrapDefinitions id;
-  mkAliasAndWrapDefinitions = wrap: option: mkAliasIfDef option (wrap (mkMerge option.definitions));
+  mkAliasAndWrapDefinitions = wrap: option: mkIf option.isDefined (wrap (mkMerge option.definitions));
 
   # Similar to mkAliasAndWrapDefinitions but copies over the priority from the
   # option as well.
@@ -1540,7 +1540,7 @@ let
       prio = option.highestPrio or defaultOverridePriority;
       defsWithPrio = map (mkOverride prio) option.definitions;
     in
-    mkAliasIfDef option (wrap (mkMerge defsWithPrio));
+    mkIf option.isDefined (wrap (mkMerge defsWithPrio));
 
   mkAliasIfDef = option: mkIf option.isDefined;
 

From 6ca8927eb02a89d4df4e4639ca9af6c8e40f0256 Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Sun, 14 Dec 2025 21:38:48 +0100
Subject: [PATCH 3/3] lib/modules: deprecate 'mkAliasIfDef'

---
 lib/modules.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index bb8faf06c9d6..b43454f651a9 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -1542,7 +1542,9 @@ let
     in
     mkIf option.isDefined (wrap (mkMerge defsWithPrio));
 
-  mkAliasIfDef = option: mkIf option.isDefined;
+  mkAliasIfDef =
+    lib.warn "Usage of 'mkAliasIfDef' has been deprecated. Use 'mkIf option.isDefined' instead."
+      (option: mkIf option.isDefined);
 
   /**
     Compatibility.