Jonathan Ringer 3bbe9a9459 Merge remote-tracking branch 'origin/staging-next' into staging ... Conflicts: pkgs/top-level/all-packages.nix		2021-11-29 10:15:20 -08: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 'origin/staging-next' into staging	2021-11-29 10:15:20 -08:00
solo5
windows	Merge pull request #145205 from Stunkymonkey/treewide-pname-version-1	2021-11-13 19:32:52 +01:00