From 3764075d2cb8ffd7963663f41582ec0f304b3757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 10 Nov 2025 08:39:10 -0800
Subject: [PATCH] python3Packages.django-compressor: 4.5.1 -> 4.6

Diff: https://github.com/django-compressor/django-compressor/compare/4.5.1...4.6

Changelog: https://github.com/django-compressor/django-compressor/blob/4.6/docs/changelog.txt
---
 .../django-compressor/default.nix             | 40 +++++++++----------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/django-compressor/default.nix b/pkgs/development/python-modules/django-compressor/default.nix
index b728fb29660c..ea930b596a17 100644
--- a/pkgs/development/python-modules/django-compressor/default.nix
+++ b/pkgs/development/python-modules/django-compressor/default.nix
@@ -1,23 +1,24 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
 
   # build-system
   setuptools,
 
   # dependencies
-  calmjs,
+  django,
   django-appconf,
-  jinja2,
   rcssmin,
   rjsmin,
 
   # tests
   beautifulsoup4,
   brotli,
+  calmjs,
   csscompressor,
   django-sekizai,
+  jinja2,
   pytestCheckHook,
   pytest-django,
 
@@ -25,35 +26,23 @@
 
 buildPythonPackage rec {
   pname = "django-compressor";
-  version = "4.5.1";
+  version = "4.6";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "django_compressor";
-    inherit version;
-    hash = "sha256-wdikii7k2LfyPEEeucl+LYjbGKGLocnoF41fW4NmqCI=";
+  src = fetchFromGitHub {
+    owner = "django-compressor";
+    repo = "django-compressor";
+    tag = version;
+    hash = "sha256-ymht/nl3UUFXLc54aqDADXArVG6jUNQppBJCNKp2P68=";
   };
 
-  patches = [
-    # https://github.com/django-compressor/django-compressor/issues/1279
-    # https://github.com/django-compressor/django-compressor/pull/1296
-    ./bs4-4.13-compat.patch
-  ];
-
   build-system = [
     setuptools
   ];
 
-  pythonRelaxDeps = [
-    "rcssmin"
-    "rjsmin"
-  ];
-
   dependencies = [
-    beautifulsoup4
-    calmjs
+    django
     django-appconf
-    jinja2
     rcssmin
     rjsmin
   ];
@@ -63,8 +52,10 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     beautifulsoup4
     brotli
+    calmjs
     csscompressor
     django-sekizai
+    jinja2
     pytestCheckHook
     pytest-django
   ];
@@ -74,6 +65,11 @@ buildPythonPackage rec {
   # You may need to run "python manage.py compress"
   disabledTestPaths = [ "compressor/tests/test_offline.py" ];
 
+  disabledTests = [
+    # we set mtime to 1980-01-02
+    "test_css_mtimes"
+  ];
+
   pythonImportsCheck = [ "compressor" ];
 
   meta = with lib; {