Vladimír Čunát 2e6bf42a22 Merge branch 'master' into staging-next ... There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299		2019-08-24 08:55:37 +02:00
..
etherape	etherape: 0.9.17 -> 0.9.18	2018-06-15 14:18:34 +02:00
ettercap	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
kismet	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
sngrep	sngrep: init at 1.4.6	2019-07-13 18:15:49 +00:00
wireshark	wireshark: 3.0.2 -> 3.0.3	2019-07-21 09:53:09 +02:00