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
..
1.10-gis-libs.template.patch
2.nix	Revert "python3Packages.django_2: fix pname"	2022-02-08 21:02:22 -08:00
3.nix	Revert "python3Packages.django_3: fix pname"	2022-02-08 21:02:22 -08:00
4.nix
django_3_set_geos_gdal_lib.patch
django_4_set_geos_gdal_lib.patch