diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-03-19 17:54:30 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-03-19 17:54:30 +0100 |
| commit | 3cf40299812c4dc9d5f1a745884f6024fce39eb6 (patch) | |
| tree | 54c2e3795232ed6e58e74244f9db62a9bb1d1e81 /pkgs | |
| parent | 2a50098657c60e422bf0477be2b4f7a6f676f3db (diff) | |
| parent | ca09a878d0dd85f1d2124c29833f8f9a1f217a65 (diff) | |
| download | nixlib-3cf40299812c4dc9d5f1a745884f6024fce39eb6.tar nixlib-3cf40299812c4dc9d5f1a745884f6024fce39eb6.tar.gz nixlib-3cf40299812c4dc9d5f1a745884f6024fce39eb6.tar.bz2 nixlib-3cf40299812c4dc9d5f1a745884f6024fce39eb6.tar.lz nixlib-3cf40299812c4dc9d5f1a745884f6024fce39eb6.tar.xz nixlib-3cf40299812c4dc9d5f1a745884f6024fce39eb6.tar.zst nixlib-3cf40299812c4dc9d5f1a745884f6024fce39eb6.zip | |
Merge pull request #1972 from vcunat/p/procps
procps-ng: make it the default procps (name and attr)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/procps-ng/default.nix | 2 | ||||
| -rw-r--r-- | 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 359e03056792..66ad9006c233 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }); |