Vladimír Čunát d5d94127fd Merge branch 'staging-next' into staging ... Minor conflicts; I hope I didn't mess up: pkgs/development/tools/misc/binutils/default.nix pkgs/games/openjk/default.nix		2022-04-14 09:53:21 +02:00
..
applications	Merge branch 'staging-next' into staging	2022-04-14 09:53:21 +02:00
build-support	Merge branch 'staging-next' into staging	2022-04-14 09:53:21 +02:00
common-updater
data	Merge branch 'staging-next' into staging	2022-04-14 09:53:21 +02:00
desktops	Merge branch 'staging-next' into staging	2022-04-14 09:53:21 +02:00
development	Merge branch 'staging-next' into staging	2022-04-14 09:53:21 +02:00
games	Merge branch 'staging-next' into staging	2022-04-14 09:53:21 +02:00
misc
os-specific	Merge branch 'staging-next' into staging	2022-04-14 09:53:21 +02:00
pkgs-lib
servers	Merge branch 'staging-next' into staging	2022-04-14 09:53:21 +02:00
shells	Merge branch 'staging-next' into staging	2022-04-14 09:53:21 +02:00
stdenv
test
tools	Merge branch 'staging-next' into staging	2022-04-14 09:53:21 +02:00
top-level	Merge branch 'staging-next' into staging	2022-04-14 09:53:21 +02:00