From 19023de862ded12fc50cfd2abd54fdc04391b553 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sat, 29 Aug 2020 14:34:46 +0200 Subject: [PATCH] htop: 2.2.0 -> 3.0.0 --- pkgs/tools/system/htop/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index c9adf5377e23..e95dece2c965 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -1,24 +1,22 @@ -{ lib, fetchurl, stdenv, ncurses, +{ lib, fetchFromGitHub, stdenv, autoreconfHook, ncurses, IOKit, python3 }: stdenv.mkDerivation rec { pname = "htop"; - version = "2.2.0"; + version = "3.0.0"; - src = fetchurl { - url = "https://hisham.hm/htop/releases/${version}/${pname}-${version}.tar.gz"; - sha256 = "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr"; + src = fetchFromGitHub { + owner = "htop-dev"; + repo = pname; + rev = version; + sha256 = "096gdnpaszs5rfp7qj8npi2jkvdqpp8mznn89f97ykrg6pgagwq4"; }; - nativeBuildInputs = [ python3 ]; + nativeBuildInputs = [ autoreconfHook python3 ]; buildInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; - prePatch = '' - patchShebangs scripts/MakeHeader.py - ''; - meta = with stdenv.lib; { description = "An interactive process viewer for Linux"; homepage = "https://hisham.hm/htop/";