From 4b2a8a6d8efe0ea2f568255de3b795166aed6731 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Jun 2024 09:36:56 +0200 Subject: [PATCH] pretalx: backport drf 3.15 support --- pkgs/by-name/pr/pretalx/package.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index 719547e835e8..784976d06eaf 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -3,6 +3,7 @@ , gettext , python3 , fetchFromGitHub +, fetchpatch2 , plugins ? [ ] , nixosTests }: @@ -25,14 +26,6 @@ let # fails with some assertions doCheck = false; }); - - djangorestframework = prev.djangorestframework.overridePythonAttrs (oldAttrs: rec { - version = "3.14.0"; - src = oldAttrs.src.override { - rev = version; - hash = "sha256-Fnj0n3NS3SetOlwSmGkLE979vNJnYE6i6xwVBslpNz4="; - }; - }); }; }; @@ -78,6 +71,15 @@ python.pkgs.buildPythonApplication rec { "static" ]; + patches = [ + (fetchpatch2 { + # Backport support for Djangorestframework 3.15.x + name = "pretalx-drf-3.15.patch"; + url = "https://github.com/pretalx/pretalx/commit/43a0416c6968d64ea57720abdb82f482940b11f8.patch"; + hash = "sha256-Iw1xVF7j7c712kwIk1SMbQSF0ixMUZr1BJib3KAb2HY="; + }) + ]; + postPatch = '' substituteInPlace src/pretalx/common/management/commands/rebuild.py \ --replace 'subprocess.check_call(["npm", "run", "build"], cwd=frontend_dir, env=env)' "" @@ -100,6 +102,7 @@ python.pkgs.buildPythonApplication rec { "django-csp" "django-filter" "django-hierarkey" + "djangorestframework" "markdown" "pillow" "python-dateutil"