Merge pull request #1972 from vcunat/p/procps

procps-ng: make it the default procps (name and attr)
This commit is contained in:
Vladimír Čunát 2014-03-19 17:54:30 +01:00
commit 3cf4029981
2 changed files with 5 additions and 3 deletions

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation {
name = "procps-ng-3.3.9";
name = "procps-3.3.9";
src = fetchurl {
url = mirror://sourceforge/procps-ng/procps-ng-3.3.9.tar.xz;

View file

@ -7096,9 +7096,11 @@ let
prayer = callPackage ../servers/prayer { };
procps = callPackage ../os-specific/linux/procps { };
procps = procps-ng;
"procps-ng" = callPackage ../os-specific/linux/procps-ng { };
procps-old = lowPrio (callPackage ../os-specific/linux/procps { });
procps-ng = callPackage ../os-specific/linux/procps-ng { };
qemu_kvm = lowPrio (qemu.override { x86Only = true; });