From 9cfb6caa7cd37167bddc67581242b0ef037e10b4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 29 Oct 2024 15:15:17 +0100 Subject: [PATCH] pretix: 2024.9.0 -> 2024.10.0 https://pretix.eu/about/en/blog/20241029-release-2024-10/ --- pkgs/by-name/pr/pretix/fakeredis-0.25-compat.patch | 10 ---------- pkgs/by-name/pr/pretix/package.nix | 11 +++++------ 2 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 pkgs/by-name/pr/pretix/fakeredis-0.25-compat.patch diff --git a/pkgs/by-name/pr/pretix/fakeredis-0.25-compat.patch b/pkgs/by-name/pr/pretix/fakeredis-0.25-compat.patch deleted file mode 100644 index 842ee4f7cac0..000000000000 --- a/pkgs/by-name/pr/pretix/fakeredis-0.25-compat.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/src/pretix/testutils/mock.py b/src/pretix/testutils/mock.py -index 66ee3fb52..9d9ba02bd 100644 ---- a/src/pretix/testutils/mock.py -+++ b/src/pretix/testutils/mock.py -@@ -38,4 +38,4 @@ def mocker_context(): - - - def get_redis_connection(alias="default", write=True): -- return fakeredis.FakeStrictRedis(server=fakeredis.FakeServer.get_server("127.0.0.1:None:v(7, 0)", (7, 0))) -+ return fakeredis.FakeStrictRedis(server=fakeredis.FakeServer.get_server("127.0.0.1:None:v(7, 0)", (7, 0), server_type="redis")) diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 6ecaeafad507..ddbbe8781a4e 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -51,13 +51,13 @@ let }; pname = "pretix"; - version = "2024.9.0"; + version = "2024.10.0"; src = fetchFromGitHub { owner = "pretix"; repo = "pretix"; rev = "refs/tags/v${version}"; - hash = "sha256-L6mTfLIx8kD/5s0Dfp24TEATmjxBXERQjynB0szH3DM="; + hash = "sha256-MCiCr00N7894DjckAw3vpxdiNtlgzqivlbSY4A/327E="; }; npmDeps = buildNpmPackage { @@ -65,7 +65,7 @@ let inherit version src; sourceRoot = "${src.name}/src/pretix/static/npm_dir"; - npmDepsHash = "sha256-zUui5tYINTDKA91WgRV51ilIPFBJpZ+S2fJwW85KJ9k="; + npmDepsHash = "sha256-PPcA6TBsU/gGk4wII+w7VZOm65nS7qGjZ/UoQs31s9M="; dontBuild = true; @@ -87,18 +87,17 @@ python.pkgs.buildPythonApplication rec { # Discover pretix.plugin entrypoints during build and add them into # INSTALLED_APPS, so that their static files are collected. ./plugin-build.patch - - # TypeError: FakeServer.get_server() missing 1 required positional argument: 'server_type' - ./fakeredis-0.25-compat.patch ]; pythonRelaxDeps = [ "django-phonenumber-field" + "dnspython" "importlib-metadata" "kombu" "markdown" "pillow" "protobuf" + "pycryptodome" "pyjwt" "python-bidi" "qrcode"