Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' ... Partial staging merge, including cc-wrapper fixes Conflicts: pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix		2015-02-02 21:14:28 -05:00
..
arora
chromium	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
conkeror	conkeror: upgrade to 141017 and use firefox for xulrunner	2014-10-22 18:08:46 +02:00
dillo	Small style fixups	2014-09-10 21:34:50 -03:00
dwb	dwb: switch to a maintained fork	2014-12-15 15:57:33 +01:00
elinks	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
firefox	firefox: Update from 35.0 -> 35.0.1	2015-01-27 04:39:45 +01:00
firefox-bin	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
jumanji	New package: jumanji-20140622	2015-01-18 23:44:18 +03:00
kwebkitpart	kde: fix CVE-2014-8600 by upstream patches	2014-12-10 19:38:50 +01:00
links	change md5sum to sha256sum for a few packages	2014-10-12 16:13:21 +02:00
links2
lynx
midori	Midori now depends on sqlite	2015-01-06 22:36:17 +03:00
mozilla
mozilla-plugins	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
netsurf	*: fix builds by disregarding warning from new glibc	2014-11-28 18:42:03 +01:00
opera	rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc	2015-01-14 20:27:55 -08:00
rekonq	rekonq: update to rekonq-2.4.2 and add wrapper	2014-11-26 22:11:50 +01:00
uzbl
vimb	vimb: Update from 2.7 to 2.8	2014-10-13 13:20:15 +02:00
vimprobable2
w3m	transformed meta.maintainers of some packages into lists	2014-09-13 13:52:02 +02:00