treewide: use a consistent meta.priority default

17 files changed, 20 insertions, 23 deletions

diff --git a/pkgs/applications/editors/kakoune/wrapper.nix b/pkgs/applications/editors/kakoune/wrapper.nix
index 578da52475f99..60ae58aa72c36 100644
--- a/pkgs/applications/editors/kakoune/wrapper.nix
+++ b/pkgs/applications/editors/kakoune/wrapper.nix
@@ -1,4 +1,4 @@
-{ symlinkJoin, makeWrapper, kakoune, plugins ? [], configure ? {} }:
+{ lib, symlinkJoin, makeWrapper, kakoune, plugins ? [], configure ? {} }:
 
 let
   # "plugins" is the preferred way, but some configurations may be
@@ -34,5 +34,5 @@ in
       rm -Rf "$out/DELETE_ME"
     '';
 
-    meta = kakoune.meta // { priority = (kakoune.meta.priority or 0) - 1; };
+    meta = kakoune.meta // { priority = (kakoune.meta.priority or lib.meta.defaultPriority) - 1; };
   }
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index 61f0230724cd1..02d6ad85b3677 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -214,7 +214,7 @@ let
       # To prevent builds on hydra
       hydraPlatforms = [];
       # prefer wrapper over the package
-      priority = (neovim-unwrapped.meta.priority or 0) - 1;
+      priority = (neovim-unwrapped.meta.priority or lib.meta.defaultPriority) - 1;
     };
   });
 in
diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix
index f8da5074b52aa..3f08a50475904 100644
--- a/pkgs/applications/misc/rofi/wrapper.nix
+++ b/pkgs/applications/misc/rofi/wrapper.nix
@@ -37,6 +37,6 @@ symlinkJoin {
   '';
 
   meta = rofi-unwrapped.meta // {
-    priority = (rofi-unwrapped.meta.priority or 0) - 1;
+    priority = (rofi-unwrapped.meta.priority or lib.meta.defaultPriority) - 1;
   };
 }
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 24319ea1a4f70..bbc88581e1e56 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -421,7 +421,7 @@ let
         inherit (browser.meta) description;
         mainProgram = launcherName;
         hydraPlatforms = [];
-        priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package
+        priority = (browser.meta.priority or lib.meta.defaultPriority) - 1; # prefer wrapper over the package
       };
     };
 in lib.makeOverridable wrapper
diff --git a/pkgs/applications/networking/cluster/helm/wrapper.nix b/pkgs/applications/networking/cluster/helm/wrapper.nix
index 3b13668abf682..d933d84db3368 100644
--- a/pkgs/applications/networking/cluster/helm/wrapper.nix
+++ b/pkgs/applications/networking/cluster/helm/wrapper.nix
@@ -40,7 +40,7 @@ in
       # To prevent builds on hydra
       hydraPlatforms = [];
       # prefer wrapper over the package
-      priority = (helm.meta.priority or 0) - 1;
+      priority = (helm.meta.priority or lib.meta.defaultPriority) - 1;
     };
   };
 in
diff --git a/pkgs/applications/window-managers/wayfire/wrapper.nix b/pkgs/applications/window-managers/wayfire/wrapper.nix
index 35bb3ad15837d..a3ec857227176 100644
--- a/pkgs/applications/window-managers/wayfire/wrapper.nix
+++ b/pkgs/applications/window-managers/wayfire/wrapper.nix
@@ -27,6 +27,6 @@ symlinkJoin {
     # To prevent builds on hydra
     hydraPlatforms = [];
     # prefer wrapper over the package
-    priority = (wayfire.meta.priority or 0) - 1;
+    priority = (wayfire.meta.priority or lib.meta.defaultPriority) - 1;
   };
 }
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index 560f59bcce7da..cb0c308ec2fab 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -68,7 +68,7 @@ runCommand name
         # Add any extra outputs specified by the caller of `buildEnv`.
         ++ lib.filter (p: p!=null)
           (builtins.map (outName: drv.${outName} or null) extraOutputsToInstall);
-      priority = drv.meta.priority or 5;
+      priority = drv.meta.priority or lib.meta.defaultPriority;
     }) paths);
     preferLocalBuild = true;
     allowSubstitutes = false;
diff --git a/pkgs/data/fonts/powerline-symbols/default.nix b/pkgs/data/fonts/powerline-symbols/default.nix
index f8b9935d6439d..39bdc4d373454 100644
--- a/pkgs/data/fonts/powerline-symbols/default.nix
+++ b/pkgs/data/fonts/powerline-symbols/default.nix
@@ -5,7 +5,7 @@ let
 in runCommand "powerline-symbols-${version}" {
   meta = {
     inherit (powerline.meta) license;
-    priority = (powerline.meta.priority or 0) + 1;
+    priority = (powerline.meta.priority or lib.meta.defaultPriority) + 1;
     maintainers = with lib.maintainers; [ midchildan ];
   };
 } ''
diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/wrapper.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/wrapper.nix
index 94af88eba97c6..7a550370ef54b 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/wrapper.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/wrapper.nix
@@ -65,6 +65,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = lomiri-system-settings-unwrapped.meta // {
     description = "System Settings application for Lomiri (wrapped)";
-    priority = (lomiri-system-settings-unwrapped.meta.priority or 0) - 1;
+    priority = (lomiri-system-settings-unwrapped.meta.priority or lib.meta.defaultPriority) - 1;
   };
 })
diff --git a/pkgs/development/python-modules/dnf4/wrapper.nix b/pkgs/development/python-modules/dnf4/wrapper.nix
index 79a3fd835912a..b84584f52fad6 100644
--- a/pkgs/development/python-modules/dnf4/wrapper.nix
+++ b/pkgs/development/python-modules/dnf4/wrapper.nix
@@ -51,6 +51,6 @@ stdenv.mkDerivation {
   };
 
   meta = dnf4-unwrapped.meta // {
-    priority = (dnf4-unwrapped.meta.priority or 0) - 1;
+    priority = (dnf4-unwrapped.meta.priority or lib.meta.defaultPriority) - 1;
   };
 }
diff --git a/pkgs/development/r-modules/wrapper-radian.nix b/pkgs/development/r-modules/wrapper-radian.nix
index cdac14d3300b3..44099206b5b55 100644
--- a/pkgs/development/r-modules/wrapper-radian.nix
+++ b/pkgs/development/r-modules/wrapper-radian.nix
@@ -22,7 +22,7 @@ runCommand (radian.name + "-wrapper") {
     # To prevent builds on hydra
     hydraPlatforms = [ ];
     # prefer wrapper over the package
-    priority = (radian.meta.priority or 0) - 1;
+    priority = (radian.meta.priority or lib.meta.defaultPriority) - 1;
   };
 } (''
   makeWrapper "${radian}/bin/radian" "$out/bin/radian" \
diff --git a/pkgs/development/r-modules/wrapper.nix b/pkgs/development/r-modules/wrapper.nix
index 12704149666ca..9dffbd83187b7 100644
--- a/pkgs/development/r-modules/wrapper.nix
+++ b/pkgs/development/r-modules/wrapper.nix
@@ -1,4 +1,4 @@
-{ symlinkJoin, R, makeWrapper, recommendedPackages, packages }:
+{ lib, symlinkJoin, R, makeWrapper, recommendedPackages, packages }:
 symlinkJoin {
   name = R.name + "-wrapper";
   preferLocalBuild = true;
@@ -26,6 +26,6 @@ symlinkJoin {
       # To prevent builds on hydra
       hydraPlatforms = [];
       # prefer wrapper over the package
-      priority = (R.meta.priority or 0) - 1;
+      priority = (R.meta.priority or lib.meta.defaultPriority) - 1;
     };
 }
diff --git a/pkgs/development/tools/analysis/rizin/wrapper.nix b/pkgs/development/tools/analysis/rizin/wrapper.nix
index 11d046c27f6d2..92fe042856cba 100644
--- a/pkgs/development/tools/analysis/rizin/wrapper.nix
+++ b/pkgs/development/tools/analysis/rizin/wrapper.nix
@@ -39,6 +39,6 @@ symlinkJoin {
 
   meta = unwrapped.meta // {
     # prefer wrapped over unwrapped
-    priority = (unwrapped.meta.priority or 0) - 1;
+    priority = (unwrapped.meta.priority or lib.meta.defaultPriority) - 1;
   };
 }
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 1522411656cd4..de85ea67eb965 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -217,7 +217,7 @@ rec {
       meta = gradle.meta // {
         # prefer normal gradle/mitm-cache over this wrapper, this wrapper only provides the setup hook
         # and passthru
-        priority = (gradle.meta.priority or 0) + 1;
+        priority = (gradle.meta.priority or lib.meta.defaultPriority) + 1;
       };
     }) { };
 }
diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix
index cbd327b07297d..5bbe7e4f8d40e 100644
--- a/pkgs/tools/networking/inetutils/default.nix
+++ b/pkgs/tools/networking/inetutils/default.nix
@@ -93,10 +93,7 @@ stdenv.mkDerivation rec {
       The `logger` binary from `util-linux` is preferred over `inetutils`.
       To instead prioritize this package, set a _lower_ `meta.priority`, or
       use e.g. `lib.setPrio 5 inetutils`.
-
-      Note that the default `meta.priority` is defined in `buildEnv` and is
-      currently 5.
     */
-    priority = (util-linux.meta.priority or 5) + 1;
+    priority = (util-linux.meta.priority or lib.meta.defaultPriority) + 1;
   };
 }
diff --git a/pkgs/tools/networking/maubot/wrapper.nix b/pkgs/tools/networking/maubot/wrapper.nix
index 6f4c577110be3..b145e802a1058 100644
--- a/pkgs/tools/networking/maubot/wrapper.nix
+++ b/pkgs/tools/networking/maubot/wrapper.nix
@@ -64,7 +64,7 @@ let wrapper = { pythonPackages ? (_: [ ]), plugins ? (_: [ ]), baseConfig ? null
       };
     };
 
-    meta.priority = (unwrapped.meta.priority or 0) - 1;
+    meta.priority = (unwrapped.meta.priority or lib.meta.defaultPriority) - 1;
   };
 in
 wrapper
diff --git a/pkgs/tools/networking/openssh/copyid.nix b/pkgs/tools/networking/openssh/copyid.nix
index b0b0d9c96a32c..7895e598e7330 100644
--- a/pkgs/tools/networking/openssh/copyid.nix
+++ b/pkgs/tools/networking/openssh/copyid.nix
@@ -1,9 +1,9 @@
-{ runCommand, openssh }:
+{ lib, runCommand, openssh }:
 
 runCommand "ssh-copy-id-${openssh.version}" {
   meta = openssh.meta // {
     description = "Tool to copy SSH public keys to a remote machine";
-    priority = (openssh.meta.priority or 0) - 1;
+    priority = (openssh.meta.priority or lib.meta.defaultPriority) - 1;
   };
 } ''
   install -Dm 755 {${openssh},$out}/bin/ssh-copy-id