Unverified Commit 51fe010f authored by Martin Weinelt's avatar Martin Weinelt
Browse files

python313Packages.django_5: 5.1.7 -> 5.1.8 

https://docs.djangoproject.com/en/5.1/releases/5.1.8/
https://www.djangoproject.com/weblog/2025/apr/02/security-releases/

Fixes: CVE-2025-27556
parent b19d7721

pkgs/development/python-modules/django/5.nix

+2 −8
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 


buildPythonPackage rec {

  pname = "django";

  version = "5.1.7";

  version = "5.1.8";

  pyproject = true;



  disabled = pythonOlder "3.10";
@@ -53,7 +53,7 @@ buildPythonPackage rec { 
    owner = "django";

    repo = "django";

    rev = "refs/tags/${version}";

    hash = "sha256-BxhHqWpTZLcx46RofnXzZ5nj4xDPcj7hNng9ppUN5Hw=";

    hash = "sha256-TZjqB9khEHnkkxYvAC/RzAvOIwdemh0uT4UVdosMq6M=";

  };



  patches =
@@ -72,12 +72,6 @@ buildPythonPackage rec { 
        url = "https://github.com/django/django/commit/12f4f95405c7857cbf2f4bf4d0261154aac31676.patch";

        hash = "sha256-+K20/V8sh036Ox9U7CSPgfxue7f28Sdhr3MsB7erVOk=";

      })



      # fix regression which breaks django-import-export

      # https://github.com/django-import-export/django-import-export/pull/2045

      # https://github.com/django/django/pull/19233

      # manual backport because commit doesn't apply on stable cleanly

      ./Restored-single_object-rgument-to-LogEntry-objects-log_actions.diff

    ]

    ++ lib.optionals withGdal [

      (replaceVars ./django_5_set_geos_gdal_lib.patch {

pkgs/development/python-modules/django/Restored-single_object-rgument-to-LogEntry-objects-log_actions.diff

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
diff --git a/django/contrib/admin/models.py b/django/contrib/admin/models.py

index 345b8cf341..2ed78d775b 100644

--- a/django/contrib/admin/models.py

+++ b/django/contrib/admin/models.py

@@ -51,7 +51,9 @@ def log_action(

             change_message=change_message,

         )

 

-    def log_actions(self, user_id, queryset, action_flag, change_message=""):

+    def log_actions(

+        self, user_id, queryset, action_flag, change_message="", *, single_object=False

+    ):

         # RemovedInDjango60Warning.

         if type(self).log_action != LogEntryManager.log_action:

             warnings.warn(