Jan Tojnar 91171e2955 Merge branch 'master' into staging-next ... Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.		2021-06-15 11:19:41 +02:00
..
bsd	netbsd: add aliases for i486 and i586	2021-06-09 22:10:41 +00:00
darwin	Merge branch 'master' into staging-next	2021-06-15 11:19:41 +02:00
linux	Merge pull request #125553 from fortuneteller2k/xanmod	2021-06-14 19:40:09 +02: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