Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/tools/misc/binutils/default.nix pkgs/tools/package-management/disnix/default.nix pkgs/top-level/all-packages.nix		2013-07-08 10:48:05 +02:00
..
amule	amule: update and fix build on gcc47	2013-03-17 10:15:03 +01:00
azureus	nixos.org/tarballs -> tarballs.nixos.org	2013-06-25 14:12:16 +02:00
bit-tornado	* Apply r32435 from the trunk (always build Python with SSL support).	2012-02-21 23:35:35 +00:00
bittorrent	Revert "fix bittorrent by using buildPythonPackage"	2012-02-28 00:06:36 +00:00
gtk-gnutella	pkgs/tools/networking/p2p/gtk-gnutella/builder.sh: dropped obsolete file	2011-08-29 22:21:29 +00:00
libtorrent	libtorrent: updated to version 0.13.2	2012-06-16 14:15:42 +00:00
rtorrent	rtorrent: updated to version 0.9.2	2012-06-16 14:15:46 +00:00
seeks	Seeks 0.4.1.	2012-07-05 00:52:36 +02:00
tahoe-lafs	tahoe-lafs: update to 1.9.2	2013-04-24 22:41:17 +04:00