mkRemovedOptionModule: assert on removed options (#69419)

mkRemovedOptionModule: assert on removed options
2019-09-30 16:39:40 +02:00
parent 1857783128 b08b0bcbbe
commit c75a18fea6
3 changed files with 9 additions and 6 deletions
@@ -592,11 +592,14 @@ rec {
    { options = setAttrByPath optionName (mkOption {
        visible = false;
      });
-      config.warnings =
-        let opt = getAttrFromPath optionName options; in
-        optional opt.isDefined ''
+      config.assertions =
+        let opt = getAttrFromPath optionName options; in [{
+          assertion = !opt.isDefined;
+          message = ''
            The option definition `${showOption optionName}' in ${showFiles opt.files} no longer has any effect; please remove it.
-            ${replacementInstructions}'';
+            ${replacementInstructions}
+          '';
+        }];
    };

  /* Return a module that causes a warning to be shown if the