From c1b61fc3404a2a60392b48fce1f36029349a1bfe Mon Sep 17 00:00:00 2001 From: Alexander Sosedkin Date: Tue, 21 Dec 2021 21:44:19 +0100 Subject: [PATCH] overlays/htop: remove since /proc/stat faking is enough --- overlays/default.nix | 3 +-- overlays/htop.nix | 39 --------------------------------------- 2 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 overlays/htop.nix diff --git a/overlays/default.nix b/overlays/default.nix index 31f4e65..9d5f845 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,6 +1,5 @@ -# Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE. +# Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE. [ - (import ./htop.nix) (import ./typespeed.nix) ] diff --git a/overlays/htop.nix b/overlays/htop.nix deleted file mode 100644 index c4ed0d8..0000000 --- a/overlays/htop.nix +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE. - -self: super: - -let - nixpkgs = import ./lib/nixpkgs.nix { inherit super; }; -in - -{ - htop = nixpkgs.stdenv.mkDerivation rec { - pname = "htop"; - version = "2.2.0"; - - src = nixpkgs.fetchurl { - url = "https://hisham.hm/htop/releases/${version}/${pname}-${version}.tar.gz"; - sha256 = "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr"; - }; - - nativeBuildInputs = [ nixpkgs.python3 ]; - buildInputs = [ nixpkgs.ncurses ]; - - prePatch = '' - patchShebangs scripts/MakeHeader.py - ''; - - meta = with nixpkgs.lib; { - description = "An interactive process viewer for Linux"; - homepage = "https://hisham.hm/htop/"; - license = licenses.gpl2Plus; - }; - - patches = [ - (nixpkgs.fetchpatch { - url = "https://raw.githubusercontent.com/termux/termux-packages/04aea16b13a246c478d28b8cc8c552a052f225ea/packages/htop/fix-missing-macros.patch"; - sha256 = "1cljkjagp66xxcjb6y1m9k4v994slfkd0s6fijh02l3rp8ycvjnv"; - }) - ]; - }; -}