From 3a2ccb570dedd7eb17226c01078b981a5129c7ea Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Mon, 20 May 2019 21:51:33 +0200 Subject: [PATCH] Revert "pstree: remove and alias to psmisc" This reverts commit 4f8bf685f83c2e3ed15840e39578fed479257c17. Reason: psmisc is Linux-platforms only --- pkgs/applications/misc/pstree/default.nix | 25 +++++++++++++++++++++++ pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/pstree/default.nix diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix new file mode 100644 index 000000000000..3cd52af6d321 --- /dev/null +++ b/pkgs/applications/misc/pstree/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "pstree-2.39"; + + src = fetchurl { + urls = [ + "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz" + "https://distfiles.macports.org/pstree/${name}.tar.gz" + ]; + sha256 = "17s7v15c4gryjpi11y1xq75022nkg4ggzvjlq2dkmyg67ssc76vw"; + }; + + unpackPhase = "unpackFile \$src; sourceRoot=."; + + buildPhase = "pwd; $CC -o pstree pstree.c"; + installPhase = "mkdir -p \$out/bin; cp pstree \$out/bin"; + + meta = { + description = "Show the set of running processes as a tree"; + license = "GPL"; + maintainers = [ ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 52464121ee54..628e19ce82b5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de6f3e832834..28775aca01b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };