Martin Weinelt 176a56c40f Merge remote-tracking branch 'origin/staging-next' into staging ...

Conflicts:
- pkgs/applications/misc/blender/default.nix
- pkgs/development/web/nodejs/nodejs.nix

2024-07-11 01:06:28 +02:00

..

3.nix

…

4.nix

…

5.nix

…

django_3_set_geos_gdal_lib.patch

…

django_3_set_zoneinfo_dir.patch

…

django_4_set_geos_gdal_lib.patch

…

django_4_set_zoneinfo_dir.patch

…

django_4_tests.patch

…

django_5_disable_failing_tests.patch

…

django_5_set_geos_gdal_lib.patch

…

django_5_set_zoneinfo_dir.patch

…

django_5_tests_pythonpath.patch

…