Merge pull request #61763 from c0bw3b/pkg/pstree-classic

pstree: re-init at 2.39 (reverts #60994)
This commit is contained in:
Renaud 2019-05-20 22:55:15 +02:00 committed by GitHub
commit 650a295621
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 1 deletions

View File

@ -0,0 +1,38 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "pstree";
version = "2.39";
src = fetchurl {
urls = [
"https://distfiles.macports.org/${pname}/${pname}-${version}.tar.gz"
"https://fossies.org/linux/misc/${pname}-${version}.tar.gz"
"ftp://ftp.thp.uni-duisburg.de/pub/source/${pname}-${version}.tar.gz"
];
sha256 = "17s7v15c4gryjpi11y1xq75022nkg4ggzvjlq2dkmyg67ssc76vw";
};
sourceRoot = ".";
buildPhase = ''
runHook preBuild
$CC $NIX_CFLAGS -o pstree pstree.c
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm0555 ${pname} -t $out/bin
install -Dm0444 ${pname}.1 -t $out/share/man/man1
runHook postInstall
'';
meta = with stdenv.lib; {
description = "Show the set of running processes as a tree";
homepage = "http://www.thp.uni-duisburg.de/pstree/";
license = licenses.gpl2;
maintainers = [ maintainers.c0bw3b ];
platforms = platforms.unix;
priority = 5; # Lower than psmisc also providing pstree on Linux platforms
};
}

View File

@ -256,7 +256,6 @@ mapAliases ({
# end
ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream.";
procps-ng = procps; # added 2018-06-08
pstree = psmisc; # added 2019-05-05
pulseaudioLight = pulseaudio; # added 2018-04-25
qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19
qt_gstreamer = qt-gstreamer; # added 2017-02

View File

@ -19572,6 +19572,8 @@ in
psol = callPackage ../development/libraries/psol { };
pstree = callPackage ../applications/misc/pstree { };
ptask = callPackage ../applications/misc/ptask { };
pulseaudio-ctl = callPackage ../applications/audio/pulseaudio-ctl { };