Martin Weinelt 9b79a05ae1 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: - pkgs/development/python-modules/flexcache/default.nix - pkgs/development/python-modules/flexparser/default.nix - pkgs/development/python-modules/odp-amsterdam/default.nix - pkgs/development/python-modules/pint/default.nix - pkgs/development/python-modules/uncertainties/default.nix - pkgs/top-level/python-packages.nix		2024-07-01 01:07:21 +02:00
..
common	Merge pull request #316334 from trofi/gcc-libgcc-musl-strip	2024-06-30 22:41:10 +02:00
patches	gcc12: 12.3.0 -> 12.4.0	2024-06-20 21:45:43 +01:00
all.nix	windows.mcfgthreads_pre_gcc_13: drop	2024-04-28 04:43:28 +02:00
default.nix	cc-wrapper: add stack clash protection hardening flag	2024-06-07 20:23:46 +01:00
versions.nix	gcc12: 12.3.0 -> 12.4.0	2024-06-20 21:45:43 +01:00