From 1eb627c4cf62f50b647d2bf287d1ea97e326539f Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 21 Mar 2022 14:39:19 +0100 Subject: [PATCH] lib.mkRenamedOptionModuleWith: Remove warnWhenRead Let's keep things simple and not poke holes in the improved migration process. --- lib/modules.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 0c9c88d2b613..093a901ff3d6 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -916,19 +916,11 @@ rec { */ sinceRelease, - /* - Options intended for reading by user modules/configuration should set this - to false. - - Usually the user modules don't read the option and we want to hold nixpkgs - itself to a high standard immediately. - */ - warnWhenRead ? true }: doRename { inherit from to; visible = false; warn = lib.isInOldestRelease sinceRelease; - use = lib.warnIf (warnWhenRead || lib.isInOldestRelease sinceRelease) + use = lib.warnIf (lib.isInOldestRelease sinceRelease) "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'."; };