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
..
arora	Arora: version bump	2010-10-15 23:43:21 +00:00
chromium	chromium: Add dependency on pciutils for v25.	2012-11-20 04:55:45 +01:00
conkeror	conkeror-1.0pre-20120316	2012-03-17 09:18:11 +00:00
elinks	Elinks: Fix libgc initialization.	2011-04-28 21:22:24 +00:00
firefox	Resurrect firefox 13 from rev ea2fbd7864 (needed for selenium testing)	2012-11-09 10:25:03 -05:00
icecat-3	* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.	2012-01-18 20:53:01 +00:00
konq-plugins	Switch to forward compatibility of kde45 on kde_baseapps.	2011-08-07 01:45:26 +00:00
links	* Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl	2007-08-24 12:32:36 +00:00
links2	Making links2 cross-build again	2012-06-22 16:04:02 +02:00
lynx	Adding the 'gzip' dependency to lynx (important cross-building).	2010-11-26 18:43:55 +00:00
midori	Update/fix Midori	2012-03-25 11:22:32 +00:00
mozilla	* Got rid of a lot of "postInstall=postInstall" and similar lines in	2009-04-23 13:31:10 +00:00
mozilla-plugins	oops, one more...	2012-11-11 09:10:36 +01:00
netsurf	Make nixpkgs ready to gtkLibs attrset removal	2012-03-14 22:44:41 +00:00
opera	opera: Upgrade to 12.11	2012-11-20 17:07:04 +01:00
rekonq	rekonq-1.1	2012-08-31 12:06:48 +04:00
uzbl	Update Uzbl	2012-11-08 10:34:06 +04:00
vimprobable2	Updating vimprobable2.	2012-06-11 20:24:55 +00:00
w3m	w3m: Fix build	2012-10-16 14:33:08 -04:00