From 26aef4457660f0ee08276632b087d3cf2de11afb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Feb 2026 03:24:08 +0100
Subject: [PATCH] python3Packages.django_5: reorganize patches

---
 .../disable-failing-test.patch}                            | 0
 .../{django_5_set_geos_gdal_lib.patch => 5.2/gdal.patch}   | 0
 .../pythonpath.patch}                                      | 0
 .../zoneinfo.patch}                                        | 0
 pkgs/development/python-modules/django/5.nix               | 7 ++++---
 5 files changed, 4 insertions(+), 3 deletions(-)
 rename pkgs/development/python-modules/django/{django_5_disable_failing_tests.patch => 5.2/disable-failing-test.patch} (100%)
 rename pkgs/development/python-modules/django/{django_5_set_geos_gdal_lib.patch => 5.2/gdal.patch} (100%)
 rename pkgs/development/python-modules/django/{django_5_tests_pythonpath.patch => 5.2/pythonpath.patch} (100%)
 rename pkgs/development/python-modules/django/{django_5_set_zoneinfo_dir.patch => 5.2/zoneinfo.patch} (100%)

diff --git a/pkgs/development/python-modules/django/django_5_disable_failing_tests.patch b/pkgs/development/python-modules/django/5.2/disable-failing-test.patch
similarity index 100%
rename from pkgs/development/python-modules/django/django_5_disable_failing_tests.patch
rename to pkgs/development/python-modules/django/5.2/disable-failing-test.patch
diff --git a/pkgs/development/python-modules/django/django_5_set_geos_gdal_lib.patch b/pkgs/development/python-modules/django/5.2/gdal.patch
similarity index 100%
rename from pkgs/development/python-modules/django/django_5_set_geos_gdal_lib.patch
rename to pkgs/development/python-modules/django/5.2/gdal.patch
diff --git a/pkgs/development/python-modules/django/django_5_tests_pythonpath.patch b/pkgs/development/python-modules/django/5.2/pythonpath.patch
similarity index 100%
rename from pkgs/development/python-modules/django/django_5_tests_pythonpath.patch
rename to pkgs/development/python-modules/django/5.2/pythonpath.patch
diff --git a/pkgs/development/python-modules/django/django_5_set_zoneinfo_dir.patch b/pkgs/development/python-modules/django/5.2/zoneinfo.patch
similarity index 100%
rename from pkgs/development/python-modules/django/django_5_set_zoneinfo_dir.patch
rename to pkgs/development/python-modules/django/5.2/zoneinfo.patch
diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix
index d35469b1af38..a1d2cdb5e6c4 100644
--- a/pkgs/development/python-modules/django/5.nix
+++ b/pkgs/development/python-modules/django/5.nix
@@ -53,11 +53,11 @@ buildPythonPackage rec {
   };
 
   patches = [
-    (replaceVars ./django_5_set_zoneinfo_dir.patch {
+    (replaceVars ./5.2/zoneinfo.patch {
       zoneinfo = tzdata + "/share/zoneinfo";
     })
     # prevent tests from messing with our pythonpath
-    ./django_5_tests_pythonpath.patch
+    ./5.2/pythonpath.patch
     # disable test that expects timezone issues
     ./django_5_disable_failing_tests.patch
 
@@ -72,9 +72,10 @@ buildPythonPackage rec {
       url = "https://github.com/django/django/commit/9cc231e8243091519f5d627cd02ee40bbb853ced.patch";
       hash = "sha256-/aimmqxurMCCntraxOtybEq8qNgZgQWLD5Gxs/3pkIU=";
     })
+    ./5.2/disable-failing-test.patch
   ]
   ++ lib.optionals withGdal [
-    (replaceVars ./django_5_set_geos_gdal_lib.patch {
+    (replaceVars ./5.2/gdal.patch {
       geos = geos;
       gdal = gdal;
       extension = stdenv.hostPlatform.extensions.sharedLibrary;