Jan Tojnar e3dfa79441 Merge branch 'staging-next' into staging ... Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.		2021-06-16 19:59:05 +02:00
..
applications	Merge branch 'staging-next' into staging	2021-06-16 19:59:05 +02:00
build-support	Merge branch 'staging-next' into staging	2021-06-16 19:59:05 +02:00
common-updater
data	Merge branch 'staging-next' into staging	2021-06-16 19:59:05 +02:00
desktops	Merge pull request #126851 from musfay/xfce.xfce4-settings-4.16.2	2021-06-16 03:03:08 +02:00
development	Merge branch 'staging-next' into staging	2021-06-16 19:59:05 +02:00
games	Merge branch 'staging-next' into staging	2021-06-16 19:59:05 +02:00
misc	Merge pull request #125890 from mweinelt/brother-mfc9140cdn	2021-06-16 00:42:18 +02:00
os-specific	Merge branch 'staging-next' into staging	2021-06-16 19:59:05 +02:00
pkgs-lib
servers	Merge branch 'staging-next' into staging	2021-06-16 19:59:05 +02:00
shells	Merge pull request #126720 from fortuneteller2k/hilbish	2021-06-15 21:41:24 +02:00
stdenv	Merge branch 'staging-next' into staging	2021-06-16 19:59:05 +02:00
test
tools	Merge branch 'staging-next' into staging	2021-06-16 19:59:05 +02:00
top-level	Merge branch 'staging-next' into staging	2021-06-16 19:59:05 +02:00