From a6a70d14a9f7b885e65a51c5e6bd02145884ee50 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Thu, 17 Dec 2020 21:50:51 +0100
Subject: lib/modules: Prefix mkRemovedOptionModule & co. check names

To avoid name clashes

Co-authored-by: Robert Hensing <robert@roberthensing.nl>
---
 lib/modules.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/modules.nix b/lib/modules.nix
index 468c373d6aa4a..5548c5f7049c3 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -888,7 +888,7 @@ rec {
       });
       config._module.checks =
         let opt = getAttrFromPath optionName options; in {
-        ${showOption optionName} = lib.mkIf opt.isDefined {
+        ${"removed-" + showOption optionName} = lib.mkIf opt.isDefined {
           message = ''
             The option definition `${showOption optionName}' in ${showFiles opt.files} no longer has any effect; please remove it.
             ${replacementInstructions}
@@ -960,7 +960,7 @@ rec {
             let val = getAttrFromPath f config;
                 opt = getAttrFromPath f options;
             in {
-              ${showOption f} = lib.mkIf (val != "_mkMergedOptionModule") {
+              ${"merged" + showOption f} = lib.mkIf (val != "_mkMergedOptionModule") {
                 type = "warning";
                 message = "The option `${showOption f}' defined in ${showFiles opt.files} has been changed to `${showOption to}' that has a different type. Please read `${showOption to}' documentation and update your configuration accordingly.";
               };
@@ -1025,7 +1025,7 @@ rec {
       });
       config = mkMerge [
         {
-          _module.checks.${showOption from} = mkIf (warn && fromOpt.isDefined) {
+          _module.checks.${"renamed-" + showOption from} = mkIf (warn && fromOpt.isDefined) {
             type = "warning";
             message = "The option `${showOption from}' defined in ${showFiles fromOpt.files} has been renamed to `${showOption to}'.";
           };
-- 
cgit 1.4.1