Sergei Trofimovich ca4da963f8 Merge remote-tracking branch 'origin/staging-next' into staging ... Conflicts: pkgs/development/libraries/audio/roc-toolkit/default.nix		2023-01-14 11:07:42 +00:00
..
applications	Merge remote-tracking branch 'origin/staging-next' into staging	2023-01-14 11:07:42 +00:00
build-support	Merge remote-tracking branch 'origin/staging-next' into staging	2023-01-14 11:07:42 +00:00
common-updater
data	Merge master into staging-next	2023-01-14 06:01:02 +00:00
desktops	Merge remote-tracking branch 'origin/master' into staging-next	2023-01-12 23:07:01 +01:00
development	Merge remote-tracking branch 'origin/staging-next' into staging	2023-01-14 11:07:42 +00:00
games	Merge master into staging-next	2023-01-14 00:02:26 +00:00
misc	Merge remote-tracking branch 'origin/master' into staging-next	2023-01-11 03:51:33 +01:00
os-specific	Merge remote-tracking branch 'origin/staging-next' into staging	2023-01-14 11:07:42 +00:00
pkgs-lib
servers	Merge remote-tracking branch 'origin/staging-next' into staging	2023-01-14 11:07:42 +00:00
shells	pkgsStatic.bash: fix build	2023-01-13 13:12:40 +00:00
stdenv	stdenv: mark binutils-patchelfed (#209600)	2023-01-14 10:07:44 +00:00
test	Merge remote-tracking branch 'origin/master' into staging-next	2023-01-11 03:51:33 +01:00
tools	Merge remote-tracking branch 'origin/staging-next' into staging	2023-01-14 11:07:42 +00:00
top-level	Merge master into staging-next	2023-01-14 06:01:02 +00:00