Merge pull request #129993 from hercules-ci/fix-mkFixStrictness

Fix lib.mkFixStrictness and deprecate
2021-07-12 08:18:06 +02:00
parent 93524fa876 cad20d8983
commit dbdde6249f
2 changed files with 3 additions and 1 deletions
@@ -116,7 +116,7 @@ let
      pushDownProperties dischargeProperties filterOverrides
      sortProperties fixupOptionType mkIf mkAssert mkMerge mkOverride
      mkOptionDefault mkDefault mkForce mkVMOverride
-      mkOrder mkBefore mkAfter mkAliasDefinitions
+      mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions
      mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule
      mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule
      mkAliasOptionModule doRename;
@@ -713,6 +713,8 @@ rec {
  mkForce = mkOverride 50;
  mkVMOverride = mkOverride 10; # used by ‘nixos-rebuild build-vm’

+  mkFixStrictness = lib.warn "lib.mkFixStrictness has no effect and will be removed. It returns its argument unmodified, so you can just remove any calls." id;
+
  mkOrder = priority: content:
    { _type = "order";
      inherit priority content;