diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index 02af5de36b4d..53ed12a22bf5 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -3,7 +3,6 @@ , gettext , python3 , fetchFromGitHub -, fetchpatch2 , plugins ? [ ] , nixosTests }: @@ -30,13 +29,13 @@ let }; }; - version = "2024.1.0"; + version = "2024.2.0"; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx"; rev = "v${version}"; - hash = "sha256-rFOlovybaEZnv5wBx6Dv8bVkP1D+CgYAKRXuNb6hLKQ="; + hash = "sha256-2HkxFS+T/lN/8EvAL3S4iVYn30y0OPmaUSneEPEA62k="; }; meta = with lib; { @@ -55,7 +54,7 @@ let sourceRoot = "${src.name}/src/pretalx/frontend/schedule-editor"; - npmDepsHash = "sha256-B9R3Nn4tURNxzeyLDHscqHxYOQK9AcmDnyNq3k5WQQs="; + npmDepsHash = "sha256-EAdeXdcC3gHun6BOHzvqpzv9+oDl1b/VTeNkYLiD+hA="; npmBuildScript = "build"; @@ -72,15 +71,6 @@ 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)' "" @@ -99,6 +89,7 @@ python.pkgs.buildPythonApplication rec { "celery" "css-inline" "cssutils" + "defusedxml" "django-compressor" "django-csp" "django-filter" @@ -122,6 +113,7 @@ python.pkgs.buildPythonApplication rec { csscompressor cssutils defusedcsv + defusedxml django django-bootstrap4 django-compressor