nixpkgs-suyu/pkgs/applications/networking/p2p
Lluís Batlle i Rossell 9183f21f7e Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00
..
gnunet GNUnet: Add `meta.platforms'. 2010-01-13 21:34:45 +00:00
ldcpp FullDepEntry -> fullDepEntry, PackEntry -> packEntry 2009-05-19 23:25:58 +00:00
mldonkey Porting changes from stdenv-updates into this branch. 2009-11-08 00:32:12 +00:00
valknut * Remove calls to fail(). 2008-04-23 07:34:20 +00:00