Jan Tojnar cea188cbbb Merge branch 'staging-next' into staging ... Conflicts: - pkgs/tools/networking/shadowfox/default.nix between e989daa65f and 1c29673fcc - pkgs/tools/networking/wuzz/default.nix between 7d80417710 and 1c29673fcc		2023-07-16 02:20:49 +02:00
..
bsd	treewide: env.NIX_CFLAGS_COMPILE use optionalString instead of optional	2023-02-22 21:23:05 +02:00
darwin	Merge staging-next into staging	2023-07-12 00:03:11 +00:00
linux	Merge branch 'staging-next' into staging	2023-07-16 02:20:49 +02:00
solo5	solo5: 0.7.5 -> 0.8.0	2023-04-29 11:18:44 +00:00
windows	gccCrossStageStatic: enable dynamic libraries, rename to gccWithoutTargetLibc	2023-07-01 13:12:40 -07:00