Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates. ... Conflicts have been resolved in: pkgs/tools/misc/file/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/python-packages.nix		2012-11-21 16:20:36 +01:00
..
browsers	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
cluster	hadoop: update to version 2.0.2-alpha	2012-10-26 11:10:13 +02:00
dropbox	* Dropbox updated to 1.4.0. Patch by Michel Alexandre Salim	2012-05-01 16:25:48 +00:00
esniper	esniper: update to version 2.28.0	2012-10-26 10:32:23 +02:00
instant-messengers	skype: Update to 4.0.0.8	2012-11-08 16:31:08 +01:00
iptraf	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
irc	Merge remote-tracking branch 'origin/master' into x-updates	2012-10-15 12:16:58 -04:00
mailreaders	mutt: fixing its gpgme support (upstream patch)	2012-11-14 22:51:18 +01:00
msmtp	update msmtp up to version 1.4.21	2010-09-17 17:34:03 +00:00
mumble	Updating mumble to 1.2.3 and adding pkgconfig as an input as it fails to build without it.	2012-03-16 19:19:00 +00:00
netperf	netperf: update to version 2.6.0	2012-08-10 11:56:22 +02:00
newsreaders	pan: Updated to 0.139	2012-07-11 17:05:13 -04:00
offrss	offrss: update to 1.3	2012-06-27 23:19:30 +02:00
p2p	mldonkey: update to 3.1.3	2012-09-25 19:37:54 +02:00
pjsip	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
remote	Update/fix PuTTY	2012-10-30 12:49:43 +04:00
siproxd	Adding siproxd	2011-01-16 11:41:19 +00:00
sniffers	Update Wireshark	2012-10-17 22:45:54 +04:00
sync	ocaml, unison: make them build on mips (native compilers)	2012-07-27 22:43:40 +02:00
umurmur	Adding umurmur and protobuf-c.	2012-09-25 19:35:03 +02:00
vnstat	vnstat: upgrade to 1.11	2012-09-02 11:57:49 +02:00
yafc	yafc: update to 1.2.3	2012-09-06 17:31:40 +02:00