Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates ... Conflicts (simple): pkgs/applications/networking/browsers/chromium/default.nix pkgs/development/libraries/libsoup/default.nix pkgs/os-specific/linux/kernel/manual-config.nix pkgs/os-specific/linux/qemu-kvm/default.nix		2013-03-02 10:41:53 +01:00
..
arora	Arora: version bump	2010-10-15 23:43:21 +00:00
chromium	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
conkeror	conkeror-1.0pre-20120316	2012-03-17 09:18:11 +00:00
elinks	Rename hostDrv -> crossDrv, buildDrv -> nativeDrv	2012-12-28 19:08:19 +01:00
firefox	firefox: Update to 19.0.1	2013-03-01 13:52:10 +01: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
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	flashplayer-11: Add missing rpath to libnss.	2013-02-28 01:24:41 +01: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	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
uzbl	Update Uzbl	2012-11-08 10:34:06 +04:00
vimprobable2	Making vimprobable2 use the default nixos ca bundle by default	2013-02-25 20:56:49 +01:00
w3m	w3m: Disable parallel building	2013-01-17 14:35:52 +01:00