public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #61138 from rnhmjoj/collide

Browse Source 
Avoid collisions between essential packages
This commit is contained in:
Graham Christensen
2019-05-08 11:42:19 -04:00
committed by GitHub
parent 81e075ab56 87bfe6e115
commit 52ce589968
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/procps-ng/default.nix
+1 -1
View File
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = https://gitlab.com/procps-ng/procps; homepage = https://gitlab.com/procps-ng/procps;
description = "Utilities that give information about processes using the /proc filesystem"; 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; license = lib.licenses.gpl2;
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.typetetris ]; maintainers = [ lib.maintainers.typetetris ];
pkgs/os-specific/linux/systemd/default.nix
+1
View File
@@ -220,6 +220,7 @@ in stdenv.mkDerivation rec {
description = "A system and service manager for Linux"; description = "A system and service manager for Linux";
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
platforms = platforms.linux; platforms = platforms.linux;
priority = 10;
maintainers = [ maintainers.eelco ]; maintainers = [ maintainers.eelco ];
}; };
} }