Alyssa Ross 01bce76b11 Merge remote-tracking branch 'nixpkgs/staging-next' into staging ... Conflicts: pkgs/applications/virtualization/qemu/default.nix		2021-11-30 18:54:47 +00:00
..
bsd	netbsd.man: fix build	2021-11-15 14:26:13 +01:00
darwin	Merge remote-tracking branch 'origin/staging-next' into staging	2021-11-29 10:15:20 -08:00
linux	Merge remote-tracking branch 'nixpkgs/staging-next' into staging	2021-11-30 18:54:47 +00:00
solo5	solo5: disable checkPhase instead of setting to null, run hooks	2021-03-26 11:06:31 +01:00
windows	Merge pull request #145205 from Stunkymonkey/treewide-pname-version-1	2021-11-13 19:32:52 +01:00