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
..
bsd	netbsd.compat: don't use musl's sys/cdefs.h	2022-01-06 14:22:07 +00:00
darwin	darwin.text_cmds: fix build	2022-01-23 08:18:46 -05:00
linux	Merge remote-tracking branch 'origin/staging-next' into staging	2022-01-24 23:49:19 -08:00
solo5	solo5: 0.6.8 -> 0.6.9	2021-12-13 22:00:02 +00:00
windows	maintainers: update personal details	2021-12-31 21:48:55 +03:00