gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pretalx: 2026.2.0 -> 2026.2.1 (#539600)

Browse Source
This commit is contained in:
Martin Weinelt
2026-07-08 13:09:42 +00:00
committed by GitHub
parent 8ab1ccd1c1 1ed5aba226
commit 5402e25e14
3 changed files with 5 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/web-apps/pretalx.nix
+2 -2
View File
@@ -277,7 +277,7 @@ in
backend = lib.mkOption {
type = with lib.types; nullOr str;
default = "redis+socket://${config.services.redis.servers.pretalx.unixSocket}?virtual_host=1";
defaultText = lib.literalExpression "redis+socket://''${config.services.redis.servers.pretalx.unixSocket}?virtual_host=1";
defaultText = lib.literalExpression "redis+socket://\${config.services.redis.servers.pretalx.unixSocket}?virtual_host=1";
description = ''
URI to the celery backend used for the asynchronous job queue.
'';
@@ -286,7 +286,7 @@ in
broker = lib.mkOption {
type = with lib.types; nullOr str;
default = "redis+socket://${config.services.redis.servers.pretalx.unixSocket}?virtual_host=2";
defaultText = lib.literalExpression "redis+socket://''${config.services.redis.servers.pretalx.unixSocket}?virtual_host=2";
defaultText = lib.literalExpression "redis+socket://\${config.services.redis.servers.pretalx.unixSocket}?virtual_host=2";
description = ''
URI to the celery broker used for the asynchronous job queue.
'';
pkgs/by-name/pr/pretalx/package.nix
+3 -8
View File
@@ -20,7 +20,7 @@ let
in
python.pkgs.buildPythonApplication (finalAttrs: {
pname = "pretalx";
version = "2026.2.0";
version = "2026.2.1";
pyproject = true;
__structuredAttrs = true;
@@ -29,14 +29,14 @@ python.pkgs.buildPythonApplication (finalAttrs: {
owner = "pretalx";
repo = "pretalx";
tag = "v${finalAttrs.version}";
hash = "sha256-c6xLSosAn0HZFkujdgC4rp1CPHLsRcz4LsiAPaSgP1g=";
hash = "sha256-dsnnr9/G8i5vfcinRiqpGv1ce90LwW7Esj/SrTK1Ov4=";
};
npmRoot = "src/pretalx/frontend";
npmDeps = fetchNpmDeps {
inherit (finalAttrs) pname version;
src = "${finalAttrs.src}/src/pretalx/frontend";
hash = "sha256-P9A2Kms+Eb1YI2qu9mt5BfiDDeXv+NkvVxy33Ns2S2A=";
hash = "sha256-wWGNvUT9SFIm/Gfl8wuOe9xTn1QqH6JWoOIHTiSg0rQ=";
};
outputs = [
@@ -44,11 +44,6 @@ python.pkgs.buildPythonApplication (finalAttrs: {
"static"
];
patches = [
# template error; https://github.com/pretalx/pretalx/pull/2559
./pr2559.patch
];
postPatch = ''
# we already provide npm deps
sed -i "/npm.*ci/d" src/pretalx/_build.py
pkgs/by-name/pr/pretalx/pr2559.patch
-23
View File
@@ -1,23 +0,0 @@
From 98186266f1a95b8eae6dcb596684ca7bd238fe48 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 8 Jul 2026 01:00:15 +0200
Subject: [PATCH] Fix admin_user_events template syntax error
---
.../orga/templates/orga/tables/columns/admin_user_events.html | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/pretalx/orga/templates/orga/tables/columns/admin_user_events.html b/src/pretalx/orga/templates/orga/tables/columns/admin_user_events.html
index b92a4c1eaa..f681a5c3fa 100644
--- a/src/pretalx/orga/templates/orga/tables/columns/admin_user_events.html
+++ b/src/pretalx/orga/templates/orga/tables/columns/admin_user_events.html
@@ -5,7 +5,8 @@
{% load i18n %}
{% if record.is_administrator %}
- {% translate "All events" } {% else %}
+ {% translate "All events" %}
+{% else %}
<ul>
{% for event in record.get_events_with_any_permission %}
<li>