Merge pull request #332507 from mweinelt/pretix-fixes

pretix: variouss fixes

nixos/modules/services/web-apps/pretix.nix

@@ -538,6 +538,7 @@ in
           TimeoutStartSec = "15min";
           ExecStart = "${getExe' pythonEnv "gunicorn"} --bind unix:/run/pretix/pretix.sock ${cfg.gunicorn.extraArgs} pretix.wsgi";
           RuntimeDirectory = "pretix";
+          Restart = "on-failure";
         };
       };
 
@@ -559,7 +560,10 @@ in
           "postgresql.service"
         ];
         wantedBy = [ "multi-user.target" ];
-        serviceConfig.ExecStart = "${getExe' pythonEnv "celery"} -A pretix.celery_app worker ${cfg.celery.extraArgs}";
+        serviceConfig = {
+          ExecStart = "${getExe' pythonEnv "celery"} -A pretix.celery_app worker ${cfg.celery.extraArgs}";
+          Restart = "on-failure";
+        };
       };
 
       nginx.serviceConfig.SupplementaryGroups = mkIf cfg.nginx.enable [ "pretix" ];

nixos/tests/web-apps/pretix.nix

@@ -20,6 +20,7 @@
         plugins = with pkgs.pretix.plugins; [
           passbook
           pages
+          zugferd
         ];
         settings = {
           pretix = {

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

@@ -13,6 +13,16 @@ let
   python = python3.override {
     self = python;
     packageOverrides = self: super: {
+      bleach = super.bleach.overridePythonAttrs (oldAttrs: rec {
+        version = "5.0.1";
+
+        src = fetchPypi {
+          pname = "bleach";
+          inherit version;
+          hash = "sha256-DQMlXEfrm9Lyaqm7fyEHcy5+j+GVyi9kcJ/POwpKCFw=";
+        };
+      });
+
       django = super.django_4;
 
       django-oauth-toolkit = super.django-oauth-toolkit.overridePythonAttrs (oldAttrs: {
@@ -84,7 +94,6 @@ python.pkgs.buildPythonApplication rec {
   ];
 
   pythonRelaxDeps = [
-    "bleach"
     "importlib-metadata"
     "pillow"
     "protobuf"

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

@@ -4,6 +4,7 @@
   fetchFromGitHub,
   pretix-plugin-build,
   setuptools,
+  django,
   drafthorse,
   ghostscript_headless,
 }:
@@ -28,10 +29,15 @@ buildPythonPackage rec {
   pythonRelaxDeps = [ "drafthorse" ];
 
   build-system = [
+    django
     pretix-plugin-build
     setuptools
   ];
 
+  postBuild = ''
+    make
+  '';
+
   dependencies = [ drafthorse ];
 
   doCheck = false; # no tests