From f20053f423f8c6579b8185ab482a4bf12886b9b6 Mon Sep 17 00:00:00 2001 From: Andreas Wiese Date: Thu, 16 Feb 2023 00:16:42 +0100 Subject: [PATCH] bpytop: remove First there was bashtop, which was replaced by bpytop for i.a. performance reasons. Now there's btop (written in C++) and another one bites the dust. Let it be gone for good. --- pkgs/tools/system/bpytop/default.nix | 49 ---------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 pkgs/tools/system/bpytop/default.nix diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix deleted file mode 100644 index 6bc0e4527a85..000000000000 --- a/pkgs/tools/system/bpytop/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, stdenv -, python3Packages -, fetchFromGitHub -, makeWrapper -}: - -stdenv.mkDerivation rec { - pname = "bpytop"; - version = "1.0.68"; - - src = fetchFromGitHub { - owner = "aristocratos"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-NHfaWWwNpGhqu/ALcW4p4X6sktEyLbKQuNHpAUUw4LY="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - propagatedBuildInputs = with python3Packages; [ python psutil ]; - - dontBuild = true; - - postPatch = '' - sed -i -e "s#/usr/\[local/\]#$out/#g" \ - -e "s#/usr/{td}#$out/#g" \ - -e "s#THEME_DIR: str = \"\"#THEME_DIR: str = \"$out/share/bpytop/themes\"#" \ - ./bpytop.py - ''; - - installPhase = '' - mkdir -p $out/{bin,libexec,share/bpytop}/ - cp -r ./themes $out/share/bpytop/ - cp ./bpytop.py $out/libexec/ - - makeWrapper ${python3Packages.python.interpreter} $out/bin/bpytop \ - --add-flags "$out/libexec/bpytop.py" \ - --prefix PYTHONPATH : "$PYTHONPATH" - ''; - - meta = with lib; { - description = "A resource monitor; python port of bashtop"; - homepage = src.meta.homepage; - license = licenses.asl20; - maintainers = with maintainers; [ aw ]; - platforms = with platforms; linux ++ freebsd ++ darwin; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d091a2eecc77..77054c5b3064 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -148,6 +148,7 @@ mapAliases ({ boost160 = throw "boost160 has been deprecated in favor of the latest version"; # Added 2023-01-01 botan = throw "botan has been removed because it did not support a supported openssl version"; # added 2021-12-15 bpftool = bpftools; # Added 2021-05-03 + bpytop = throw "bpytop has been deprecated by btop"; # Added 2023-02-16 brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # Added 2021-01-24 bridge_utils = throw "'bridge_utils' has been renamed to/replaced by 'bridge-utils'"; # Converted to throw 2022-02-22 bro = zeek; # Added 2019-09-29 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 361eacc84d3b..cef3dc42f001 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3809,8 +3809,6 @@ with pkgs; bpb = callPackage ../tools/security/bpb { inherit (darwin.apple_sdk.frameworks) Security; }; - bpytop = callPackage ../tools/system/bpytop { }; - brasero-original = lowPrio (callPackage ../tools/cd-dvd/brasero { }); brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { };