nixpkgs/pkgs
Jonathan Ringer e379e3d4bb
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/googleapis-common-protos/default.nix
2022-01-24 23:49:19 -08:00
..
applications Merge remote-tracking branch 'origin/staging-next' into staging 2022-01-24 23:49:19 -08:00
build-support Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-01-24 15:39:34 +00:00
common-updater
data Merge master into staging-next 2022-01-24 18:01:03 +00:00
desktops Merge master into staging-next 2022-01-24 00:01:45 +00:00
development Merge remote-tracking branch 'origin/staging-next' into staging 2022-01-24 23:49:19 -08:00
games Merge master into staging-next 2022-01-25 06:01:33 +00:00
misc Merge master into staging-next 2022-01-25 00:02:13 +00:00
os-specific Merge remote-tracking branch 'origin/staging-next' into staging 2022-01-24 23:49:19 -08:00
pkgs-lib
servers Merge remote-tracking branch 'origin/staging-next' into staging 2022-01-24 23:49:19 -08:00
shells
stdenv
test
tools Merge remote-tracking branch 'origin/staging-next' into staging 2022-01-24 23:49:19 -08:00
top-level Merge remote-tracking branch 'origin/staging-next' into staging 2022-01-24 23:49:19 -08:00