public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

htop: fetchFromGitHub -> fetchurl

Browse Source 
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.
This commit is contained in:
Tobias Geerinckx-Rice 2016-03-14 15:50:36 +01:00
parent 06bebedf66
commit 561f93d59c
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/os-specific/linux/htop/default.nix
View File

@ -1,22 +1,15 @@
{ fetchFromGitHub, stdenv, autoreconfHook, ncurses }: { fetchurl, stdenv, ncurses }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "htop-${version}"; name = "htop-${version}";
version = "2.0.1"; version = "2.0.1";
src = fetchFromGitHub { src = fetchurl {
sha256 = "0llj8ixgyjjq9vymsiysv7qnlc7f04jzm6lc9wm7nhcnymn7jg8z"; sha256 = "0rjn9ybqx5sav7z4gn18f1q6k23nmqyb6yydfgghzdznz9nn447l";
rev = version; url = "http://hisham.hm/htop/releases/${version}/${name}.tar.gz";
repo = "htop";
owner = "hishamhm";
}; };
buildInputs = [ ncurses ]; buildInputs = [ ncurses ];
nativeBuildInputs = [ autoreconfHook ];
postPatch = ''
touch *.h */*.h # unnecessary regeneration requires Python
'';
meta = { meta = {
description = "An interactive process viewer for Linux"; description = "An interactive process viewer for Linux";