pretix: 2025.5.0 -> 2025.6.0 (#420653)

pkgs/by-name/pr/pretalx/package.nix

@@ -83,7 +83,7 @@ python.pkgs.buildPythonApplication rec {
     "bleach"
     "beautifulsoup4"
     "celery"
-    "css-inline"
+    "css_inline"
     "cssutils"
     "defusedxml"
     "django-compressor"

pkgs/by-name/pr/pretix/package.nix

@@ -42,13 +42,13 @@ let
   };
 
   pname = "pretix";
-  version = "2025.5.0";
+  version = "2025.6.0";
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix";
     rev = "refs/tags/v${version}";
-    hash = "sha256-vu+7jKXIuNZ4BN2IamdDxGJkraj93eNYUT3sUU2LCAg=";
+    hash = "sha256-bDE4ygTCX7hynWjoni9ZWMGujKvPk0TKaG42SQ6w9Rk=";
   };
 
   npmDeps = buildNpmPackage {
@@ -56,7 +56,7 @@ let
     inherit version src;
 
     sourceRoot = "${src.name}/src/pretix/static/npm_dir";
-    npmDepsHash = "sha256-NSBSL6+0ancoPHbvJu4fBxK8EVj06dbltjHqJi2yh5w=";
+    npmDepsHash = "sha256-LQPbOC9SaolD/fyiFoObndx7pcS7iaYVytz6y+bQZqQ=";
 
     dontBuild = true;
 
@@ -91,6 +91,7 @@ python.pkgs.buildPythonApplication rec {
     "importlib-metadata"
     "kombu"
     "markdown"
+    "oauthlib"
     "phonenumberslite"
     "pillow"
     "protobuf"

pkgs/by-name/pr/pretix/plugins/servicefees/package.nix

@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pretix-servicefees";
-  version = "1.14.0";
+  version = "1.14.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-servicefees";
     tag = "v${version}";
-    hash = "sha256-PsVItCBFJ4dRdRY2jKJ7aErYx/bhxKQtDsiJbyXsNKk=";
+    hash = "sha256-iceFpmuWlq4LnZpG57d4Fwx9bXJDGwx+ox58s8oxupU=";
   };
 
   build-system = [

pkgs/by-name/pr/pretix/plugins/zugferd/package.nix

@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pretix-zugferd";
-  version = "2.4.0";
+  version = "2.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-zugferd";
     rev = "v${version}";
-    hash = "sha256-VtmlgxqV34e3Yu9uTYwJAZoZQ/TQoEJgjHcpqUsxxq8=";
+    hash = "sha256-GChHhtWYION84hmGZl92FKDvfLjlZ0QWHuTcc9ScWk8=";
   };
 
   postPatch = ''

pkgs/development/python-modules/css-inline/default.nix

@@ -17,19 +17,22 @@
 
 buildPythonPackage rec {
   pname = "css-inline";
-  version = "0.14.6";
+  version = "0.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Stranger6667";
     repo = "css-inline";
     rev = "python-v${version}";
-    hash = "sha256-x0DxoEKXgMMIlebzL6xVedViGGra2Bx/aox0XiXi+Dc=";
+    hash = "sha256-js9n+m5xDlzxMbXtN74klS0rjTCsHL3LhVAp0tx48b0=";
   };
 
   postPatch = ''
     cd bindings/python
     ln -s ${./Cargo.lock} Cargo.lock
+
+    # don't rebuild std
+    rm .cargo/config.toml
   '';
 
   # call `cargo build --release` in bindings/python and copy the
@@ -40,7 +43,7 @@ buildPythonPackage rec {
       cd bindings/python
       ln -s ${./Cargo.lock} Cargo.lock
     '';
-    hash = "sha256-4zi29ZdALummwcWxYqDDEPAjKptmLqyYUJzWMrEK4os=";
+    hash = "sha256-4DVLcJrK2at1vlThey0N97IWFHd1NM2MEXXA74BYfZs=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/django-redis/default.nix

@@ -7,22 +7,23 @@
 
   # propagated
   django,
-  hiredis,
   lz4,
   msgpack,
+  pyzstd,
   redis,
 
   # testing
-  pkgs,
   pytest-cov-stub,
   pytest-django,
   pytest-mock,
+  pytest-xdist,
   pytestCheckHook,
+  redisTestHook,
 }:
 
 buildPythonPackage rec {
   pname = "django-redis";
-  version = "5.4.0";
+  version = "6.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -31,15 +32,16 @@ buildPythonPackage rec {
     owner = "jazzband";
     repo = "django-redis";
     tag = version;
-    hash = "sha256-m7z3c7My24vrSSnyfDQ/LlWhy7pV4U0L8LATMvkfczc=";
+    hash = "sha256-QfiyeeDQSRp/TkOun/HAQaPbIUY9yKPoOOEhKBX9Tec=";
   };
 
   build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     django
     lz4
     msgpack
+    pyzstd
     redis
   ];
 
@@ -51,37 +53,23 @@ buildPythonPackage rec {
 
   preCheck = ''
     export DJANGO_SETTINGS_MODULE=tests.settings.sqlite
-
-    ${pkgs.valkey}/bin/redis-server &
-    REDIS_PID=$!
-  '';
-
-  postCheck = ''
-    kill $REDIS_PID
   '';
 
   nativeCheckInputs = [
     pytest-cov-stub
     pytest-django
     pytest-mock
+    pytest-xdist
     pytestCheckHook
+    redisTestHook
   ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
-  pytestFlagsArray = [
-    "-W"
-    "ignore::DeprecationWarning"
-  ];
+  # https://github.com/jazzband/django-redis/issues/777
+  dontUsePytestXdist = true;
 
   disabledTests = [
-    # ModuleNotFoundError: No module named 'test_cache_options'
-    "test_custom_key_function"
-    # ModuleNotFoundError: No module named 'test_client'
-    "test_delete_pattern_calls_delete_for_given_keys"
-    "test_delete_pattern_calls_get_client_given_no_client"
-    "test_delete_pattern_calls_make_pattern"
-    "test_delete_pattern_calls_pipeline_delete_and_execute"
-    "test_delete_pattern_calls_scan_iter"
-    "test_delete_pattern_calls_scan_iter_with_count_if_itersize_given"
+    # AttributeError: <asgiref.local._CVar object at 0x7ffff57ed950> object has no attribute 'default'
+    "test_delete_pattern_with_settings_default_scan_count"
   ];
 
   __darwinAllowLocalNetworking = true;