Skip to content

Commit

Permalink
treewide: use a consistent meta.priority default
Browse files Browse the repository at this point in the history
  • Loading branch information
philiptaron committed Aug 29, 2024
1 parent 24a9af7 commit ae92f31
Show file tree
Hide file tree
Showing 19 changed files with 31 additions and 31 deletions.
15 changes: 9 additions & 6 deletions lib/meta.nix
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,17 @@ rec {
mapDerivationAttrset = f: set: lib.mapAttrs (name: pkg: if lib.isDerivation pkg then (f pkg) else pkg) set;

/**
Set the nix-env priority of the package.
The default priority of packages in Nix. See `defaultPriority` in [`src/nix/profile.cc`](https://github.com/NixOS/nix/blob/master/src/nix/profile.cc#L47).
*/
defaultPriority = 5;

/**
Set the nix-env priority of the package. Note that higher values are lower priority, and vice versa.
# Inputs
`priority`
: 1\. Function argument
: 1\. The priority to set.
`drv`
: 2\. Function argument
Expand All @@ -159,8 +164,7 @@ rec {
lowPrio = setPrio 10;

/**
Apply lowPrio to an attrset with derivations
Apply lowPrio to an attrset with derivations.
# Inputs
Expand All @@ -184,8 +188,7 @@ rec {
hiPrio = setPrio (-10);

/**
Apply hiPrio to an attrset with derivations
Apply hiPrio to an attrset with derivations.
# Inputs
Expand Down
4 changes: 2 additions & 2 deletions nixos/modules/config/system-path.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ with lib;

let

requiredPackages = map (pkg: setPrio ((pkg.meta.priority or 5) + 3) pkg)
requiredPackages = map (pkg: setPrio ((pkg.meta.priority or lib.meta.defaultPriority) + 3) pkg)
[ pkgs.acl
pkgs.attr
pkgs.bashInteractive # bash with ncurses support
Expand Down Expand Up @@ -48,7 +48,7 @@ let
];
defaultPackages =
map
(n: let pkg = pkgs.${n}; in setPrio ((pkg.meta.priority or 5) + 3) pkg)
(n: let pkg = pkgs.${n}; in setPrio ((pkg.meta.priority or lib.meta.defaultPriority) + 3) pkg)
defaultPackageNames;
defaultPackagesText = "[ ${concatMapStringsSep " " (n: "pkgs.${n}") defaultPackageNames } ]";

Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/editors/kakoune/wrapper.nix
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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; };
}
2 changes: 1 addition & 1 deletion pkgs/applications/editors/neovim/wrapper.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/rofi/wrapper.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/networking/browsers/firefox/wrapper.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pkgs/applications/networking/cluster/helm/wrapper.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/window-managers/wayfire/wrapper.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
}
2 changes: 1 addition & 1 deletion pkgs/build-support/buildenv/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/data/fonts/powerline-symbols/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
};
} ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
})
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/dnf4/wrapper.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
}
2 changes: 1 addition & 1 deletion pkgs/development/r-modules/wrapper-radian.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/r-modules/wrapper.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ symlinkJoin, R, makeWrapper, recommendedPackages, packages }:
{ lib, symlinkJoin, R, makeWrapper, recommendedPackages, packages }:
symlinkJoin {
name = R.name + "-wrapper";
preferLocalBuild = true;
Expand Down Expand Up @@ -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;
};
}
2 changes: 1 addition & 1 deletion pkgs/development/tools/analysis/rizin/wrapper.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
}
2 changes: 1 addition & 1 deletion pkgs/development/tools/build-managers/gradle/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
}) { };
}
5 changes: 1 addition & 4 deletions pkgs/tools/networking/inetutils/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
}
2 changes: 1 addition & 1 deletion pkgs/tools/networking/maubot/wrapper.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions pkgs/tools/networking/openssh/copyid.nix
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit ae92f31

Please sign in to comment.