Michael Weiss 25aed428aa chromium: Make the gnChromium overrides depend on the version ... This is more robust than depending on the channel, though the version should only matter if the configuration phase fails. This also switches to the intended version for `chromium` which should be higher since M85 is in the stable channel. Thanks `@volth` for pointing this out.		2020-08-25 23:22:41 +02:00
..
applications	chromium: Make the gnChromium overrides depend on the version	2020-08-25 23:22:41 +02:00
build-support	Merge branch 'master' into staging-next	2020-08-23 02:00:50 +02:00
common-updater
data	Merge pull request #95544 from endgame/oldschool-pc-font-bump	2020-08-24 02:43:15 +02:00
desktops	Merge pull request #96103 from deviant/remove-rfkill	2020-08-24 18:14:14 +02:00
development	Merge branch 'llvm_11' into master	2020-08-25 19:44:53 +02:00
games	papermc: 1.15.2r161 -> 1.16.2r141	2020-08-25 14:24:52 +02:00
misc	ghostscript: add patch for CVE-2020-15900	2020-08-24 11:57:06 +02:00
os-specific	linux/hardened/patches/5.7: 5.7.16.a -> 5.7.17.a	2020-08-25 09:12:16 -04:00
pkgs-lib
servers	etcd_3_4: 3.4.10 -> 3.4.13	2020-08-25 20:29:50 +10:00
shells	Merge pull request #96276 from r-ryantm/auto-update/elvish	2020-08-25 10:08:34 -07:00
stdenv	Merge pull request #95129 from aaronjanse/aj-fix-llvm-for-redox	2020-08-19 15:07:20 -05:00
test
tools	Merge pull request #96212 from r-ryantm/auto-update/bashmount	2020-08-25 06:59:52 -07:00
top-level	Merge branch 'llvm_11' into master	2020-08-25 19:44:53 +02:00