From ca09a878d0dd85f1d2124c29833f8f9a1f217a65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 13 Mar 2014 23:52:59 +0100
Subject: [PATCH] procps-ng: make it the default procps (name and attr)
---
pkgs/os-specific/linux/procps-ng/default.nix | 2 +-
pkgs/top-level/all-packages.nix | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index 0b3389f903a8..cd8a8eaec133 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -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;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba6cb440c741..d2ceacfa7fe0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7090,9 +7090,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; });