From 79418dda8bf90a72782a60d731805eb9481a446d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Feb 2026 03:15:56 +0100 Subject: [PATCH 1/3] python3Packages.django_6: 6.0.1 -> 6.0.2 https://docs.djangoproject.com/en/6.0/releases/6.0.2/ https://www.djangoproject.com/weblog/2026/feb/03/security-releases/ Fixes: CVE-2025-13473, CVE-2025-14550, CVE-2026-1207, CVE-2026-1285, CVE-2026-1287, CVE-2026-1312 --- pkgs/development/python-modules/django/6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/6.nix b/pkgs/development/python-modules/django/6.nix index cc4335692c55..148b597baaf7 100644 --- a/pkgs/development/python-modules/django/6.nix +++ b/pkgs/development/python-modules/django/6.nix @@ -42,7 +42,7 @@ buildPythonPackage (finalAttrs: { pname = "django"; - version = "6.0.1"; + version = "6.0.2"; pyproject = true; disabled = pythonOlder "3.12"; @@ -51,7 +51,7 @@ buildPythonPackage (finalAttrs: { owner = "django"; repo = "django"; tag = finalAttrs.version; - hash = "sha256-RvxEjFMKaYrnK3u5GkdAm2gHzpdOck9Qx3Yahz3W5Jo="; + hash = "sha256-59zbILbU+G9q7hwF8IbipykZLCWEHEx+cLRglJpvuQw="; }; patches = [ From 26aef4457660f0ee08276632b087d3cf2de11afb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Feb 2026 03:24:08 +0100 Subject: [PATCH 2/3] 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; From 2fd5c616419faacc2f2ff2c83e45b45256993a79 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Feb 2026 03:26:36 +0100 Subject: [PATCH 3/3] python3Packages.django_5: 5.2.9 -> 5.2.11 https://docs.djangoproject.com/en/5.2/releases/5.2.10/ https://docs.djangoproject.com/en/5.2/releases/5.2.11/ https://www.djangoproject.com/weblog/2026/feb/03/security-releases/ Fixes: CVE-2025-13473, CVE-2025-14550, CVE-2026-1207, CVE-2026-1285, CVE-2026-1287, CVE-2026-1312 --- pkgs/development/python-modules/django/5.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index a1d2cdb5e6c4..621ff3972623 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, replaceVars, # build-system @@ -42,14 +41,14 @@ buildPythonPackage rec { pname = "django"; - version = "5.2.9"; + version = "5.2.11"; pyproject = true; src = fetchFromGitHub { owner = "django"; repo = "django"; tag = version; - hash = "sha256-9URe8hB15WP92AU1YgGGFfZhVxn59gfBRrORZ04L+F0="; + hash = "sha256-Ldscb87ts0CPbt5uBiL3DK3qhU6SzTmsEUl90Afko84="; }; patches = [ @@ -59,19 +58,6 @@ buildPythonPackage rec { # prevent tests from messing with our pythonpath ./5.2/pythonpath.patch # disable test that expects timezone issues - ./django_5_disable_failing_tests.patch - - # 3.14.1/3.13.10 comapt - (fetchpatch { - # https://github.com/django/django/pull/20390 - url = "https://github.com/django/django/commit/5ca0f62213911a77dd4a62e843db7e420cc98b78.patch"; - hash = "sha256-SpVdbS4S5wqvrrUOoZJ7d2cIbtmgI0mvxwwCveSA068="; - }) - (fetchpatch { - # https://github.com/django/django/pull/20392 - url = "https://github.com/django/django/commit/9cc231e8243091519f5d627cd02ee40bbb853ced.patch"; - hash = "sha256-/aimmqxurMCCntraxOtybEq8qNgZgQWLD5Gxs/3pkIU="; - }) ./5.2/disable-failing-test.patch ] ++ lib.optionals withGdal [