Vladimír Čunát 7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates ... Conflicts (taken from @7c6f434c): pkgs/development/libraries/libgphoto2/default.nix		2013-06-08 15:41:39 +00:00
..
arora	Arora: version bump	2010-10-15 23:43:21 +00:00
chromium	chromium: Update stable and beta channels.	2013-06-07 14:39:00 +02:00
conkeror	conkeror: Update to 1.0pre-20130401.	2013-04-03 22:48:17 +04:00
elinks	elinks: allow building without guile	2013-03-16 13:39:30 +01:00
firefox	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
icecat-3	* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.	2012-01-18 20:53:01 +00:00
kwebkitpart	KWebKitPart: new package	2013-05-10 05:03:54 +03:00
links	* Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl	2007-08-24 12:32:36 +00:00
links2	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
lynx	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01: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	Fix NS plugin wrapper build	2013-05-23 17:32:04 +04:00
netsurf	Mark some packages as low priority and disambiguate some others	2012-11-29 15:26:13 +01:00
opera	opera: Update to 12.12	2012-12-20 14:45:15 +01:00
rekonq	rekonq: update	2013-03-02 14:44:51 +01:00
uzbl	Update Uzbl	2012-11-08 10:34:06 +04:00
vimprobable2	vimprobable2, surf: fix the settings-schemas problem	2013-03-14 16:01:53 +01:00
w3m	w3m: Disable parallel building	2013-01-17 14:35:52 +01:00