diff options
| author | Graham Christensen <graham@grahamc.com> | 2019-05-08 11:42:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-08 11:42:19 -0400 |
| commit | 52ce5899683aa735b6a1225a368130dd03da0093 (patch) | |
| tree | 6dcc3b6f61383e768d2715cdf1ca20a0cfcebe5f /pkgs/os-specific | |
| parent | 81e075ab56feb141c4fc89c6a3d79bb447350879 (diff) | |
| parent | 87bfe6e115432cad7149b9c207fe4ae172c67d52 (diff) | |
| download | nixlib-52ce5899683aa735b6a1225a368130dd03da0093.tar nixlib-52ce5899683aa735b6a1225a368130dd03da0093.tar.gz nixlib-52ce5899683aa735b6a1225a368130dd03da0093.tar.bz2 nixlib-52ce5899683aa735b6a1225a368130dd03da0093.tar.lz nixlib-52ce5899683aa735b6a1225a368130dd03da0093.tar.xz nixlib-52ce5899683aa735b6a1225a368130dd03da0093.tar.zst nixlib-52ce5899683aa735b6a1225a368130dd03da0093.zip | |
Merge pull request #61138 from rnhmjoj/collide
Avoid collisions between essential packages
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/procps-ng/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 272812ccb588..1ed85bc94cb7 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://gitlab.com/procps-ng/procps; description = "Utilities that give information about processes using the /proc filesystem"; - priority = 10; # less than coreutils, which also provides "kill" and "uptime" + priority = 11; # less than coreutils, which also provides "kill" and "uptime" license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.typetetris ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index bc071d21ce43..9d95269daa92 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -220,6 +220,7 @@ in stdenv.mkDerivation rec { description = "A system and service manager for Linux"; license = licenses.lgpl21Plus; platforms = platforms.linux; + priority = 10; maintainers = [ maintainers.eelco ]; }; } |