Alyssa Ross 191075fa83 Merge remote-tracking branch 'origin/staging-next' into staging ... Conflicts: pkgs/os-specific/linux/kernel/patches.nix pkgs/top-level/linux-kernels.nix		2023-05-26 18:37:26 +00:00
..
bsd	treewide: env.NIX_CFLAGS_COMPILE use optionalString instead of optional	2023-02-22 21:23:05 +02:00
darwin	asitop: use top-level fetchPypi	2023-05-25 12:06:14 -04:00
linux	Merge remote-tracking branch 'origin/staging-next' into staging	2023-05-26 18:37:26 +00:00
solo5	solo5: 0.7.5 -> 0.8.0	2023-04-29 11:18:44 +00:00
windows	treewide: use optionalString	2023-02-13 21:52:34 +01:00