Lluís Batlle i Rossell a3403e6828 Finishing the update from trunk, having resolved the eclipse related directory ... renaming. I think directory renaming breaks the usual merges... because it leaves the 'to be removed' directory in the working directory still. A manual 'rm' of the 'to be removed' directory fixed the commit. svn merge ^/nixpkgs/trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=18661		2009-11-26 21:46:08 +00:00
..
aircrack-ng
aria
axel
bsd-finger
cksfv	* cksfv 1.3.14.	2009-08-11 13:49:13 +00:00
curl	Porting changes from stdenv-updates into this branch.	2009-11-08 00:32:12 +00:00
curlftpfs
ddclient	ddclient	2009-09-16 11:27:18 +00:00
dhcp	* dhcp: don't bring down an interface to delete old addresses / route	2009-09-29 16:14:33 +00:00
dhcpcd
dnsmasq
eggdrop	added eggdrop, iftop	2009-10-08 07:01:55 +00:00
gftp
glusterfs	Adding GlusterFS - a distributed storage system	2009-08-31 09:52:01 +00:00
gupnp-tools
gvpe	Fix /sbin/ reference. On Linux just replace it with an "ip link" reference	2009-09-01 22:42:05 +00:00
host
iftop	added eggdrop, iftop	2009-10-08 07:01:55 +00:00
imapsync
inetutils
iodine
iperf
jnettop
jwhois
lftp
lsh	lsh: Fix typo.	2009-09-08 10:31:07 +00:00
mailutils	Mailutils: Restrict to GNU platforms.	2009-09-12 20:53:21 +00:00
nbd	Link nbd package statically.	2009-09-28 15:10:55 +00:00
nc6	* Removed selectVersion. There's no good reason to write	2009-11-18 09:39:59 +00:00
ncat
ncftp	* added ncftp	2009-09-17 07:31:34 +00:00
netcat
netkit/tftp	Adding netkit tftp client and server.	2009-08-19 20:19:27 +00:00
netselect
nss-mdns
ntp
nylon
openssh	Finally I decided to add High Performance SSH.	2009-11-02 21:49:06 +00:00
openvpn
p2p	Rename Tahoe to Tahoe-LAFS.	2009-10-31 22:34:24 +00:00
par2cmdline
pdsh
ppp
privoxy	coreutils not needed as input for privoxy	2009-10-05 15:56:36 +00:00
proxychains
rp-pppoe
sitecopy	openssl support or sitecopy	2009-10-05 12:21:50 +00:00
smbfs-fuse	* Removed selectVersion. There's no good reason to write	2009-11-18 09:39:59 +00:00
socat	Fix the cleanup-induced problems	2009-11-23 12:21:34 +00:00
sshfs-fuse
ssmtp
stun	adding stun	2009-10-18 04:43:45 +00:00
stunnel
tcng
tcpdump
telnet
vpnc
vtun
wdfs
wget	Porting changes from stdenv-updates into this branch.	2009-11-08 00:32:12 +00:00
x11-ssh-askpass