Jan Tojnar 625ce6c7f6 Merge branch 'staging-next' into staging ... In python-packages.nix, resolve conflict between 50d604314e and 187d0371ab.		2021-04-08 17:14:31 +02:00
..
applications	Merge branch 'staging-next' into staging	2021-04-08 17:14:31 +02: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
development	Merge branch 'staging-next' into staging	2021-04-08 17:14:31 +02:00
games	devilutionx: unstable-2020-10-20 -> 1.2.0	2021-04-08 11:02:11 +02:00
misc	Merge master into staging-next	2021-04-07 12:06:23 +00:00
os-specific	Merge branch 'staging-next' into staging	2021-04-08 17:14:31 +02:00
pkgs-lib
servers	Merge branch 'staging-next' into staging	2021-04-08 17:14:31 +02: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 17:14:31 +02:00
top-level	Merge branch 'staging-next' into staging	2021-04-08 17:14:31 +02:00