Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3b57908018df
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bc1b117218e4
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 3, 2021

  1. iptraf-ng: 1.1.4 -> 1.2.1

    @devhell
    devhell committed Jan 3, 2021
    Copy the full SHA
    c4b7f5d View commit details

  2. Merge pull request #107793 from devhell/iptraf-ng 

    iptraf-ng: 1.1.4 -> 1.2.1
    @stigtsp
    stigtsp authored Jan 3, 2021
    Copy the full SHA
    bc1b117 View commit details
Showing with 17 additions and 14 deletions.
  1. +17 −14 pkgs/applications/networking/iptraf-ng/default.nix
31 changes: 17 additions & 14 deletions pkgs/applications/networking/iptraf-ng/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
{ stdenv, fetchurl, ncurses }:
{ stdenv, fetchFromGitHub, ncurses }:

stdenv.mkDerivation rec {
version = "1.1.4";
version = "1.2.1";
pname = "iptraf-ng";

src = fetchurl {
url = "https://fedorahosted.org/releases/i/p/iptraf-ng/${pname}-${version}.tar.gz";
sha256 = "02gb8z9h2s6s1ybyikywz7jgb1mafdx88hijfasv3khcgkq0q53r";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "1f91w1bjaayr6ld95z2q55ny983bb0m05k1jrw2bcddvcihaiqb1";
};

buildInputs = [ ncurses ];

configurePhase = ''
./configure --prefix=$out/usr --sysconfdir=$out/etc \
--localstatedir=$out/var --sbindir=$out/bin
'';
makeFlags = [
"DESTDIR=$(out)"
"prefix=/usr"
"sbindir=/bin"
];

hardeningDisable = [ "format" ];

meta = {
meta = with stdenv.lib; {
description = "A console-based network monitoring utility (fork of iptraf)";
longDescription = ''
IPTraf-ng is a console-based network monitoring utility. IPTraf-ng
@@ -38,9 +41,9 @@ stdenv.mkDerivation rec {
of the Linux kernel, so it can be used on a wide variety of supported
network cards.
'';
homepage = "https://fedorahosted.org/iptraf-ng/";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.devhell ];
homepage = "https://github.com/iptraf-ng/iptraf-ng";
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = with maintainers; [ devhell ];
};
}