diff options
author | c0bw3b <c0bw3b@users.noreply.github.com> | 2019-05-05 17:51:52 +0200 |
---|---|---|
committer | Lassulus <github@lassul.us> | 2019-05-08 02:53:09 +0900 |
commit | 4f8bf685f83c2e3ed15840e39578fed479257c17 (patch) | |
tree | 26b6dbc00de0dc6db30d8665e521e92e08600d08 /pkgs | |
parent | 715002eaf7f51b3122867b982cc1e82d010cb08e (diff) | |
download | nixpkgs-4f8bf685f83c2e3ed15840e39578fed479257c17.tar nixpkgs-4f8bf685f83c2e3ed15840e39578fed479257c17.tar.gz nixpkgs-4f8bf685f83c2e3ed15840e39578fed479257c17.tar.bz2 nixpkgs-4f8bf685f83c2e3ed15840e39578fed479257c17.tar.lz nixpkgs-4f8bf685f83c2e3ed15840e39578fed479257c17.tar.xz nixpkgs-4f8bf685f83c2e3ed15840e39578fed479257c17.tar.zst nixpkgs-4f8bf685f83c2e3ed15840e39578fed479257c17.zip |
pstree: remove and alias to psmisc
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/pstree/default.nix | 25 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 1 insertions, 27 deletions
diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix deleted file mode 100644 index 3cd52af6d32..00000000000 --- a/pkgs/applications/misc/pstree/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ 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 d0e826704ae..a4bea8b8033 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -255,6 +255,7 @@ 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 af6c3d0d001..98d4e2582d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19461,8 +19461,6 @@ in psol = callPackage ../development/libraries/psol { }; - pstree = callPackage ../applications/misc/pstree { }; - ptask = callPackage ../applications/misc/ptask { }; pulseaudio-ctl = callPackage ../applications/audio/pulseaudio-ctl { }; |