Dmitry Kalinkin 219590673c Merge branch 'staging-next' into staging ... Conflicts: pkgs/development/python-modules/panel/default.nix pkgs/os-specific/linux/kernel/generic.nix pkgs/servers/home-assistant/default.nix		2021-04-08 22:42:26 -04:00
..
applications	Merge branch 'staging-next' into staging	2021-04-08 22:42:26 -04:00
build-support	Merge master into staging-next	2021-04-08 12:06:16 +00:00
common-updater
data	Merge master into staging-next	2021-04-08 12:06:16 +00:00
desktops	plasma5: mark broken with Qt < 5.15	2021-04-07 14:12:19 -05:00
development	Merge branch 'staging-next' into staging	2021-04-08 22:42:26 -04:00
games	devilutionx: update sha256, fix build	2021-04-08 18:18:46 -04:00
misc	Merge master into staging-next	2021-04-09 00:16:01 +00:00
os-specific	Merge branch 'staging-next' into staging	2021-04-08 22:42:26 -04:00
pkgs-lib
servers	Merge branch 'staging-next' into staging	2021-04-08 22:42:26 -04:00
shells	Merge master into staging-next	2021-04-08 00:17:24 +00:00
stdenv
test
tools	Merge branch 'staging-next' into staging	2021-04-08 22:42:26 -04:00
top-level	Merge branch 'staging-next' into staging	2021-04-08 22:42:26 -04:00