From 561f93d59c2541398f4fa494bb9e8ccc33b53617 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 14 Mar 2016 15:50:36 +0100 Subject: [PATCH] htop: fetchFromGitHub -> fetchurl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Just call `fetchurl` on the ‘official’ download link. `fetchFromGitHub` was introduced in 54916ba, and stayed around when we moved back to a regular release. Which worked fine, but required keeping `autoreconfHook` and some `postPatch` hackery which can now both be dropped. Thanks to @kragniz for drawing my attention to this. --- pkgs/os-specific/linux/htop/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/htop/default.nix b/pkgs/os-specific/linux/htop/default.nix index de18378a32bb..ce82ca9a5e43 100644 --- a/pkgs/os-specific/linux/htop/default.nix +++ b/pkgs/os-specific/linux/htop/default.nix @@ -1,22 +1,15 @@ -{ fetchFromGitHub, stdenv, autoreconfHook, ncurses }: +{ fetchurl, stdenv, ncurses }: stdenv.mkDerivation rec { name = "htop-${version}"; version = "2.0.1"; - src = fetchFromGitHub { - sha256 = "0llj8ixgyjjq9vymsiysv7qnlc7f04jzm6lc9wm7nhcnymn7jg8z"; - rev = version; - repo = "htop"; - owner = "hishamhm"; + src = fetchurl { + sha256 = "0rjn9ybqx5sav7z4gn18f1q6k23nmqyb6yydfgghzdznz9nn447l"; + url = "http://hisham.hm/htop/releases/${version}/${name}.tar.gz"; }; buildInputs = [ ncurses ]; - nativeBuildInputs = [ autoreconfHook ]; - - postPatch = '' - touch *.h */*.h # unnecessary regeneration requires Python - ''; meta = { description = "An interactive process viewer for Linux";