Jonathan Ringer 6b15fdce86 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/shells/ion/default.nix pkgs/tools/misc/cicero-tui/default.nix		2021-05-20 22:11:42 -07:00
..
bsd	netbsd: 8.0 -> 9.1	2021-05-09 18:56:20 +00:00
darwin	darwin.ICU: avoid platform.darwinMinVersion references on non-darwin	2021-05-17 00:28:05 +09:00
linux	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-20 22:11:42 -07:00
solo5	solo5: disable checkPhase instead of setting to null, run hooks	2021-03-26 11:06:31 +01:00
windows	treewide: All the linker to be chosen independently	2021-05-14 21:29:51 +00:00