Alyssa Ross 8ba23e138d Merge remote-tracking branch 'nixpkgs/staging-next' into staging ... Conflicts: pkgs/development/libraries/zlib/default.nix pkgs/development/lua-modules/overrides.nix		2022-04-02 16:45:48 +00:00
..
bsd	netbsd.compat: don't use musl's sys/cdefs.h	2022-01-06 14:22:07 +00:00
darwin	Merge remote-tracking branch 'origin/master' into staging-next	2022-03-31 03:49:37 +02:00
linux	Merge remote-tracking branch 'nixpkgs/staging-next' into staging	2022-04-02 16:45:48 +00: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