Jonathan Ringer 5df08e00cd Merge remote-tracking branch 'origin/master' into staging-next ...

Conflicts:
	pkgs/development/python-modules/opensimplex/default.nix
	pkgs/development/python-modules/pygame-gui/default.nix
	pkgs/top-level/aliases.nix
	pkgs/top-level/python-aliases.nix

2022-02-08 21:19:24 -08:00

..

default.nix

Merge remote-tracking branch 'origin/master' into staging-next

2022-02-08 21:19:24 -08:00

executable-name.patch

…

fix_poppler.patch

…

paths.patch

…

tests.patch

…