diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 0409dfd92e05..3dba95437a1b 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -42,13 +42,13 @@ let }; pname = "pretix"; - version = "2025.7.1"; + version = "2025.8.0"; src = fetchFromGitHub { owner = "pretix"; repo = "pretix"; rev = "refs/tags/v${version}"; - hash = "sha256-emPzCwViqbGqlQRYmyamhQ5y6a3g67TTYIdv6FWbGEU="; + hash = "sha256-89BAQZpXyyTg6T9hxm4EV8QHZDcD3FcnGKxAulxziyg="; }; npmDeps = buildNpmPackage { @@ -56,7 +56,7 @@ let inherit version src; sourceRoot = "${src.name}/src/pretix/static/npm_dir"; - npmDepsHash = "sha256-cvyOpEw6z0cNUdHRmyEZUoeKPMOAtC+YHYXCltbHdm0="; + npmDepsHash = "sha256-E2K9SYqRbhpQi83va8D02cwPnf51haoKv4P/ppU2m08="; dontBuild = true; @@ -85,6 +85,7 @@ python.pkgs.buildPythonApplication rec { "celery" "css-inline" "django-bootstrap3" + "django-formset-js-improved" "django-i18nfield" "django-localflavor" "django-phonenumber-field" @@ -97,6 +98,7 @@ python.pkgs.buildPythonApplication rec { "phonenumberslite" "pillow" "protobuf" + "pycparser" "pycryptodome" "pyjwt" "pypdf" @@ -127,6 +129,10 @@ python.pkgs.buildPythonApplication rec { substituteInPlace pyproject.toml \ --replace-fail '"backend"' '"setuptools.build_meta"' \ --replace-fail 'backend-path = ["_build"]' "" + + # npm ci would remove and try to reinstall node_modules + substituteInPlace src/pretix/_build.py \ + --replace-fail "npm ci" "npm install" ''; build-system = with python.pkgs; [ diff --git a/pkgs/by-name/pr/pretix/plugins/sepadebit/package.nix b/pkgs/by-name/pr/pretix/plugins/sepadebit/package.nix index d5ad04b3da56..cdcfe017b7bb 100644 --- a/pkgs/by-name/pr/pretix/plugins/sepadebit/package.nix +++ b/pkgs/by-name/pr/pretix/plugins/sepadebit/package.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pretix-sepadebit"; - version = "2.6.0"; + version = "2.7.0"; pyproject = true; src = fetchFromGitHub { owner = "pretix"; repo = "pretix-sepadebit"; tag = "v${version}"; - hash = "sha256-o4HVPuSpYIFjxmYuL+IsJJDkv+4ARuvaDqPjxWxlhMg="; + hash = "sha256-Xnp7aic+Xf4wJzJbWqhsfMajT4AOQGQMIGIewJ5B37o="; }; build-system = [ @@ -55,6 +55,12 @@ buildPythonPackage rec { export DJANGO_SETTINGS_MODULE=pretix.testutils.settings ''; + disabledTests = [ + # https://github.com/pretix/pretix-sepadebit/issues/69 + "test_mail_context" + "test_call_mail_context" + ]; + meta = with lib; { description = "Plugin to receive payments via SEPA direct debit"; homepage = "https://github.com/pretix/pretix-sepadebit"; diff --git a/pkgs/by-name/pr/pretix/plugins/servicefees/package.nix b/pkgs/by-name/pr/pretix/plugins/servicefees/package.nix index 4a54e9b368fc..2a6d21f248cc 100644 --- a/pkgs/by-name/pr/pretix/plugins/servicefees/package.nix +++ b/pkgs/by-name/pr/pretix/plugins/servicefees/package.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pretix-servicefees"; - version = "1.14.1"; + version = "1.15.0"; pyproject = true; src = fetchFromGitHub { owner = "pretix"; repo = "pretix-servicefees"; tag = "v${version}"; - hash = "sha256-iceFpmuWlq4LnZpG57d4Fwx9bXJDGwx+ox58s8oxupU="; + hash = "sha256-oxuxlwNYJsuYj5zm2VYRMn8wz3vF92SzGxD8w3N7ZIM="; }; build-system = [ diff --git a/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix index 063c72d367c8..a606f3480c8e 100644 --- a/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix +++ b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pretix-zugferd"; - version = "2.4.2"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "pretix"; repo = "pretix-zugferd"; rev = "v${version}"; - hash = "sha256-ARTQjd78lkcs16cULAaudMtW1DmDKGf3gNBQZIHCQ1E="; + hash = "sha256-Qy/yfinj5EGjzhJmiczOSIP/GsTZabFt8e6Ki4AaN6w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/django-formset-js-improved/default.nix b/pkgs/development/python-modules/django-formset-js-improved/default.nix index da8c2704b171..067a6faab9c5 100644 --- a/pkgs/development/python-modules/django-formset-js-improved/default.nix +++ b/pkgs/development/python-modules/django-formset-js-improved/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, + setuptools, django, django-jquery-js, }: @@ -9,7 +11,7 @@ buildPythonPackage rec { pname = "django-formset-js-improved"; version = "0.5.0.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "pretix"; @@ -18,9 +20,18 @@ buildPythonPackage rec { hash = "sha256-bOM24ldXk9WeV0jl6LIJB3BJ5hVWLA1PJTBBnJBoprU="; }; + patches = [ + (fetchpatch { + url = "https://github.com/pretix/django-formset-js/commit/7d8a33190d58ff9d75270264342eba82672d054e.patch"; + hash = "sha256-eBRP0eqMnH7UM9cToR+diejO6dMDDVt2bbUHLDcaWjk="; + }) + ]; + + build-system = [ setuptools ]; + buildInputs = [ django ]; - propagatedBuildInputs = [ django-jquery-js ]; + dependencies = [ django-jquery-js ]; pythonImportsCheck = [ "djangoformsetjs" ];