Jan Tojnar 2da5ce4ab3 Merge branch 'staging-next' into staging ... ; Conflicts: ; pkgs/development/python-modules/fakeredis/default.nix		2022-01-28 14:05:11 +01:00
..
applications	Merge branch 'staging-next' into staging	2022-01-28 14:05:11 +01:00
build-support	Merge branch 'staging-next' into staging	2022-01-28 14:05:11 +01:00
common-updater
data	Merge branch 'staging-next' into staging	2022-01-28 14:05:11 +01:00
desktops	Merge pull request #156936 from bobby285271/pantheon	2022-01-27 21:03:07 +08:00
development	Merge branch 'staging-next' into staging	2022-01-28 14:05:11 +01:00
games	Merge pull request #157116 from muscaln/polymc	2022-01-28 12:00:21 +01:00
misc	Merge pull request #151363 from Stunkymonkey/doc-updateWalker	2022-01-27 14:06:36 +01:00
os-specific	Merge branch 'staging-next' into staging	2022-01-28 14:05:11 +01:00
pkgs-lib
servers	Merge branch 'staging-next' into staging	2022-01-28 14:05:11 +01:00
shells	Merge pull request #155362 from kampka/dash-test	2022-01-25 22:18:30 +01:00
stdenv	Merge branch 'staging-next' into staging	2022-01-28 14:05:11 +01:00
test
tools	Merge branch 'staging-next' into staging	2022-01-28 14:05:11 +01:00
top-level	Merge branch 'staging-next' into staging	2022-01-28 14:05:11 +01:00