Jan Tojnar 625ce6c7f6 Merge branch 'staging-next' into staging ... In python-packages.nix, resolve conflict between 50d604314e and 187d0371ab.		2021-04-08 17:14:31 +02:00
..
bsd	yacc: deprecate alias	2021-04-04 03:18:58 +02:00
darwin	darwin.text_cmds: Fix editor check	2021-04-04 19:49:52 +02:00
linux	Merge branch 'staging-next' into staging	2021-04-08 17:14:31 +02:00
solo5	solo5: disable checkPhase instead of setting to null, run hooks	2021-03-26 11:06:31 +01:00
windows	lzma: deprecate alias	2021-04-04 19:49:52 +02:00