Jan Tojnar d9f177eb4d Merge branch 'staging-next' into staging ... The transmission conflict was non-trivial: - libbrotli added to apparmor rules <1bdda029cd> - apparmor rules rewritten <b280e64078> Chosen the rewrite and verified that brotli is part of the rule set generated by `apparmorRulesFromClosure`.		2021-05-06 08:42:50 +02:00
..
applications	Merge branch 'staging-next' into staging	2021-05-06 08:42:50 +02:00
build-support
common-updater
data	Merge pull request #120999 from r-ryantm/auto-update/inter	2021-05-05 22:40:55 -05:00
desktops	Merge branch 'staging-next' into staging	2021-05-06 08:42:50 +02:00
development	Merge branch 'staging-next' into staging	2021-05-06 08:42:50 +02:00
games	factorio-experimental: 1.1.32 -> 1.1.33	2021-05-04 01:05:21 +00:00
misc	Merge branch 'staging-next' into staging	2021-05-06 08:42:50 +02:00
os-specific	Merge branch 'staging-next' into staging	2021-05-06 08:42:50 +02:00
pkgs-lib	formats.ini: Introduce listToValue argument (#121613)	2021-05-04 09:49:25 +02:00
servers	Merge branch 'staging-next' into staging	2021-05-06 08:42:50 +02:00
shells	Merge staging-next into staging	2021-05-05 18:24:02 +00:00
stdenv
test
tools	Merge branch 'staging-next' into staging	2021-05-06 08:42:50 +02:00
top-level	Merge branch 'staging-next' into staging	2021-05-06 08:42:50 +02:00