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
..
base.nix	Merge pull request #318256 from risicle/ris-stack-clash-protection	2024-06-19 19:54:30 +02:00
builder-wow.sh
cert-path.patch
default.nix
fonts.nix
packages.nix
setup-hook-darwin.sh
sources.nix	wineWow64Packages.unstable: 9.11 -> 9.12	2024-06-30 12:41:47 +00:00
staging.nix
update-lib.sh
util.nix
winetricks.nix	treewide: Remove indefinite article from meta.description	2024-06-09 23:07:45 +02:00