Jonathan Ringer 6ede9cd761 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/applications/audio/hybridreverb2/default.nix		2021-11-19 08:44:33 -08:00
..
bsd	netbsd: add missing rsync native build inputs	2021-11-09 22:53:22 +00:00
darwin	Revert "follow up to pname+version switch: libs"	2021-11-13 13:21:27 +01:00
linux	Merge remote-tracking branch 'origin/master' into staging-next	2021-11-19 08:44:33 -08: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