Jonathan Ringer 46fd0afcb3 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/development/python-modules/pysdl2/default.nix pkgs/top-level/aliases.nix		2022-02-06 18:36:59 -08:00
..
bsd	netbsd.compat: don't use musl's sys/cdefs.h	2022-01-06 14:22:07 +00:00
darwin	duti: update homepage	2022-02-06 15:10:26 +01:00
linux	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-06 18:36:59 -08:00
solo5	solo5: patch solo5-virtio-mkimage to use our Syslinux, etc	2022-02-05 21:32:18 +01:00
windows	maintainers: update personal details	2021-12-31 21:48:55 +03:00