git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #107793 from devhell/iptraf-ng

iptraf-ng: 1.1.4 -> 1.2.1

commitbc1b117218e4986c4518a087a0c64e906b6c5e61 authorstigo <stig@stig.io> dateSun 3 Jan 2021, 20:13 (6 years ago) parent3b57908c4b7f5d
1 file changed+17−14
pkgs/applications/networking/iptraf-ng/default.nix+17−14
pkgs/applications/networking/iptraf-ng/default.nix+17−14
@@ -1,24 +1,27 @@
1−{ stdenv, fetchurl, ncurses }:
1+{ stdenv, fetchFromGitHub, ncurses }:
22
33stdenv.mkDerivation rec {
4− version = "1.1.4";
4+ version = "1.2.1";
55 pname = "iptraf-ng";
66
7− src = fetchurl {
8− url = "https://fedorahosted.org/releases/i/p/iptraf-ng/${pname}-${version}.tar.gz";
9− sha256 = "02gb8z9h2s6s1ybyikywz7jgb1mafdx88hijfasv3khcgkq0q53r";
7+ src = fetchFromGitHub {
8+ owner = pname;
9+ repo = pname;
10+ rev = "v${version}";
11+ sha256 = "1f91w1bjaayr6ld95z2q55ny983bb0m05k1jrw2bcddvcihaiqb1";
1012 };
1113
1214 buildInputs = [ ncurses ];
1315
14− configurePhase = ''
15− ./configure --prefix=$out/usr --sysconfdir=$out/etc \
16− --localstatedir=$out/var --sbindir=$out/bin
17− '';
16+ makeFlags = [
17+ "DESTDIR=$(out)"
18+ "prefix=/usr"
19+ "sbindir=/bin"
20+ ];
1821
1922 hardeningDisable = [ "format" ];
2023
21− meta = {
24+ meta = with stdenv.lib; {
2225 description = "A console-based network monitoring utility (fork of iptraf)";
2326 longDescription = ''
2427 IPTraf-ng is a console-based network monitoring utility. IPTraf-ng
@@ -38,9 +41,9 @@ stdenv.mkDerivation rec {
3841 of the Linux kernel, so it can be used on a wide variety of supported
3942 network cards.
4043 '';
41− homepage = "https://fedorahosted.org/iptraf-ng/";
42− license = stdenv.lib.licenses.gpl2;
43− platforms = stdenv.lib.platforms.linux;
44− maintainers = [ stdenv.lib.maintainers.devhell ];
44+ homepage = "https://github.com/iptraf-ng/iptraf-ng";
45+ license = licenses.gpl2Only;
46+ platforms = platforms.linux;
47+ maintainers = with maintainers; [ devhell ];
4548 };
4649}