tree-wide: defaultOverridePriority -> priorities.baseline

NixOS · Nov 4, 2024 · 04f60e7 · 04f60e7
1 parent e82eed7
commit 04f60e7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/tests/modules/test-mergeAttrDefinitionsWithPrio.nix b/lib/tests/modules/test-mergeAttrDefinitionsWithPrio.nix
@@ -15,7 +15,7 @@ in
   };
   config.result =
     assert defs.default.highestPrio == (lib.mkDefault (assertLazy __curPos)).priority;
-    assert defs.regular.highestPrio == lib.modules.defaultOverridePriority;
+    assert defs.regular.highestPrio == lib.modules.priorities.baseline;
     assert defs.force.highestPrio == (lib.mkForce (assertLazy __curPos)).priority;
     true;
 }
diff --git a/nixos/lib/testing/driver.nix b/nixos/lib/testing/driver.nix
@@ -191,7 +191,7 @@ in
     _module.args = {
       hostPkgs =
         # Comment is in nixos/modules/misc/nixpkgs.nix
-        lib.mkOverride lib.modules.defaultOverridePriority
+        lib.mkOverride lib.modules.priorities.baseline
           config.hostPkgs.__splicedPackages;
     };
 

diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
@@ -335,7 +335,7 @@ in
         # which is somewhat costly for Nixpkgs. With an explicit priority, we only
         # evaluate the wrapper to find out that the priority is lower, and then we
         # don't need to evaluate `finalPkgs`.
-        lib.mkOverride lib.modules.defaultOverridePriority
+        lib.mkOverride lib.modules.priorities.baseline
           finalPkgs.__splicedPackages;
     };
 
@@ -346,7 +346,7 @@ in
         # We set it with default priority and it can not be merged, so if the
         # pkgs module argument has that priority, it's from us.
         (lib.modules.mergeAttrDefinitionsWithPrio options._module.args).pkgs.highestPrio
-          == lib.modules.defaultOverridePriority
+          == lib.modules.priorities.baseline
         # Although, if nixpkgs.pkgs is set, we did forward it, but we did not construct it.
           && !opt.pkgs.isDefined;
     in [