nixpkgs

alioth/nixpkgs

Fork 0

forked from mirrors/nixpkgs

Commit graph

Author SHA1 Message Date

Author	SHA1	Message	Date
William A. Kennington III	6602f49495	Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06"" This reverts commit `741bf840da`. This reverts the fallout from reverting the major changes.	2015-11-14 12:32:51 -08:00
Eelco Dolstra	741bf840da	Revert "Merge pull request #9543 from NixOS/staging.post-15.06" This reverts commit `f61176c539`, reversing changes made to `a27ca029ee`. Conflicts: pkgs/development/libraries/ncurses/default.nix	2015-10-06 15:24:20 +02:00
devhell	66dd86d4ca	iptraf-ng: init at 1.1.4 This commit adds `iptraf-ng` which is a fork of `iptraf`. The original has not been updated in ~10 years. This fork is more modern but development is a bit slow (last update to master 15 months ago). Nevertheless, unlike `iptraf` this one doesn't barf around and works properly.	2015-10-01 22:38:50 +01:00

William A. Kennington III

6602f49495

Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""

This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.

2015-11-14 12:32:51 -08:00

Eelco Dolstra

741bf840da

Revert "Merge pull request #9543 from NixOS/staging.post-15.06"

This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix

2015-10-06 15:24:20 +02:00

devhell

66dd86d4ca

iptraf-ng: init at 1.1.4

This commit adds `iptraf-ng` which is a fork of `iptraf`. The original
has not been updated in ~10 years. This fork is more modern but
development is a bit slow (last update to master 15 months ago).
Nevertheless, unlike `iptraf` this one doesn't barf around and works
properly.

2015-10-01 22:38:50 +01:00

3 commits