aszlig 3f7735fe65 chromium+chrome: Don't import update.nix directly ... Regression introduced by f28b71023c. Let's now expose and use the upstream-info attribute via the main Chromium derivation, so that other packages like the google-chrome package doesn't need to rely on internals of the Chromium implementation. Signed-off-by: aszlig <aszlig@redmoonstudios.org>		2016-05-04 23:12:33 +02:00
..
applications	chromium+chrome: Don't import update.nix directly	2016-05-04 23:12:33 +02:00
build-support	grsecurity: support disabling TCP simultaneous connect	2016-05-04 03:53:24 +02:00
data	geolite-legacy: 2016-05-02 -> 2016-05-03	2016-05-03 23:42:08 +02:00
desktops	Merge pull request #15215 from romildo/upd.xfce4-cpufreq-plugin	2016-05-04 21:37:33 +03:00
development	ocaml-oasis: 0.4.5 -> 0.4.6 (#15209)	2016-05-04 19:12:20 +02:00
games	Init CKAN: The Comprehensive Kerbal Archive Network (#15202)	2016-05-04 02:12:39 +01:00
misc	Greybird: init at 2016-03-11	2016-05-03 06:45:17 -03:00
os-specific	Merge pull request #15217 from LumiGuide/fix-mdadm-sendmail	2016-05-04 20:09:02 +02:00
servers	lighttpd: 1.4.37 -> 1.4.39	2016-05-03 16:15:20 +02:00
shells	oh-my-zsh: 2016-04-06 -> 2016-04-20	2016-04-30 01:43:31 +00:00
stdenv	bootstrap-tools-linux: Use tar without acl	2016-04-18 12:04:37 +02:00
test	Remove cruft	2016-04-26 17:31:54 +02:00
tools	Merge pull request #15135 from gpyh/asciidoctor	2016-05-04 20:42:26 +01:00
top-level	Merge pull request #15135 from gpyh/asciidoctor	2016-05-04 20:42:26 +01:00