From 6821263ae5bd7f1993f8411b2a5cc64fd867fc58 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 28 Apr 2025 12:49:52 +0300 Subject: [PATCH] python312Packages.django_4: backport fix for test brokenness --- pkgs/development/python-modules/django/4.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index f1e54fc8dd9a..7489f40c4ea9 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -72,6 +72,14 @@ buildPythonPackage rec { url = "https://github.com/django/django/commit/12f4f95405c7857cbf2f4bf4d0261154aac31676.patch"; hash = "sha256-+K20/V8sh036Ox9U7CSPgfxue7f28Sdhr3MsB7erVOk="; }) + + # backport fix for https://code.djangoproject.com/ticket/36056 + # FIXME: remove if ever backported upstream + (fetchpatch { + url = "https://github.com/django/django/commit/ec0e784f91b551c654f0962431cc31091926792d.patch"; + includes = [ "django/*" ]; # tests don't apply + hash = "sha256-8YwdOBNJq6+GNoxzdLyN9HEEIWRXGQk9YbyfPwYVkwU="; + }) ] ++ lib.optionals withGdal [ (replaceVars ./django_4_set_geos_gdal_lib.patch {