From b4f03263ec00489464ae5d8d04c3f27c42a5ee8e Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 14 Jan 2016 20:47:55 +0100 Subject: [PATCH] nethogs: 0.8.1-git -> 0.8.1 Also use fetchFromGitHub, use make flags instead of patching Makefile, and add myself as maintainer since the package is unmaintained. --- pkgs/tools/networking/nethogs/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/tools/networking/nethogs/default.nix index 3b22458ebe3f..c8ff0c7a1609 100644 --- a/pkgs/tools/networking/nethogs/default.nix +++ b/pkgs/tools/networking/nethogs/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchgit, ncurses, libpcap }: +{ stdenv, fetchFromGitHub, ncurses, libpcap }: stdenv.mkDerivation rec { name = "nethogs-${version}"; + version = "0.8.1"; - version = "0.8.1-git"; - - src = fetchgit { - url = git://github.com/raboof/nethogs.git; - rev = "f6f9e890ea731b8acdcb8906642afae4cd96baa8"; - sha256 = "0dj5sdyxdlssbnjbdf8k7x896m2zgyyg31g12dl5n6irqdrb5scf"; + src = fetchFromGitHub { + owner = "raboof"; + repo = "nethogs"; + rev = "v${version}"; + sha256 = "1phn6i44ysvpl1f54bx4dspy51si8rc2wq6fywi163mi25j355d4"; }; buildInputs = [ ncurses libpcap ]; - preConfigure = '' - substituteInPlace Makefile --replace "prefix := /usr/local" "prefix := $out" - ''; + installFlags = [ "prefix=$(out)" "sbin=$(prefix)/bin" ]; meta = with stdenv.lib; { description = "A small 'net top' tool, grouping bandwidth by process"; @@ -31,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; homepage = http://nethogs.sourceforge.net/; platforms = platforms.linux; + maintainer = [ maintainers.rycee ]; }; }