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
..
amule	amule: fix build	2018-09-03 12:59:18 -04:00
azureus	treewide: Add lots of platforms to packages with no meta	2016-08-02 21:17:44 +03:00
gtk-gnutella	gtk-gnutella: 1.1.9 -> 1.1.14 (#62151)	2019-05-28 14:54:17 +02:00
libtorrent	libtorrent: remove released patch	2019-07-29 21:56:30 +02:00
rtorrent	rtorrent: 0.9.7 -> 0.9.8	2019-07-19 20:35:43 -05:00
seeks	treewide: stdenv.lib.platforms.gnu -> ... gnu ++ linux	2018-04-30 18:12:10 -05:00
tahoe-lafs	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00