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

pretalx: 2024.2.1 -> 2024.3.0 (#350361)

Browse Source
This commit is contained in:
Martin Weinelt
2024-10-22 12:50:20 +02:00
committed by GitHub
parent b4c90d349e a12121e081
commit cc2a580af3
17 changed files with 77 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/web-apps/pretalx.nix
+11 -1
View File
@@ -22,7 +22,6 @@ let
]
++ finalPackage.optional-dependencies.redis
++ lib.optionals cfg.celery.enable [ celery ]
++ lib.optionals (cfg.settings.database.backend == "mysql") finalPackage.optional-dependencies.mysql
++ lib.optionals (cfg.settings.database.backend == "postgresql") finalPackage.optional-dependencies.postgres;
};
in
@@ -184,6 +183,17 @@ in
};
};
files = {
upload_limit = lib.mkOption {
type = lib.types.ints.positive;
default = 10;
example = 50;
description = ''
Maximum file upload size in MiB.
'';
};
};
filesystem = {
data = lib.mkOption {
type = lib.types.path;
pkgs/applications/networking/powerdns-admin/default.nix
+1
View File
@@ -13,6 +13,7 @@ let
python = python3;
pythonDeps = with python.pkgs; [
distutils
flask flask-assets flask-login flask-sqlalchemy flask-migrate flask-seasurf flask-mail flask-session flask-session-captcha flask-sslify
mysqlclient psycopg2 sqlalchemy
certifi cffi configobj cryptography bcrypt requests python-ldap pyotp qrcode dnspython
pkgs/by-name/fd/fdroidserver/package.nix
+4 -1
View File
@@ -48,7 +48,10 @@ python3Packages.buildPythonApplication {
nativeBuildInputs = [ installShellFiles ];
build-system = with python3Packages; [ babel ];
build-system = with python3Packages; [
setuptools
babel
];
dependencies = with python3Packages; [
androguard
pkgs/by-name/pa/pacu/package.nix
+1
View File
@@ -28,6 +28,7 @@ python.pkgs.buildPythonApplication rec {
"sqlalchemy-utils"
"sqlalchemy"
"pycognito"
"qrcode"
"urllib3"
];
pkgs/by-name/pr/pretalx/package.nix
+11 -6
View File
@@ -11,6 +11,8 @@ let
python = python3.override {
self = python;
packageOverrides = final: prev: {
django = prev.django_5;
django-bootstrap4 = prev.django-bootstrap4.overridePythonAttrs (oldAttrs: rec {
version = "3.0.0";
src = oldAttrs.src.override {
@@ -26,16 +28,22 @@ let
# fails with some assertions
doCheck = false;
});
django-extensions = prev.django-extensions.overridePythonAttrs {
# Compat issues with Django 5.1
# https://github.com/django-extensions/django-extensions/issues/1885
doCheck = false;
};
};
};
version = "2024.2.1";
version = "2024.3.0";
src = fetchFromGitHub {
owner = "pretalx";
repo = "pretalx";
rev = "v${version}";
hash = "sha256-D0ju9aOVy/new9GWqyFalZYCisdmM7irWSbn2TVCJYQ=";
hash = "sha256-Xv3VwYrwCGgOUf1ilD58ATj+bkehF9+im4124ivCaEU=";
};
meta = with lib; {
@@ -54,7 +62,7 @@ let
sourceRoot = "${src.name}/src/pretalx/frontend/schedule-editor";
npmDepsHash = "sha256-EAdeXdcC3gHun6BOHzvqpzv9+oDl1b/VTeNkYLiD+hA=";
npmDepsHash = "sha256-i7awRuR7NxhpxN2IZuI01PsN6FjXht7BxTbB1k039HA=";
npmBuildScript = "build";
@@ -146,9 +154,6 @@ python.pkgs.buildPythonApplication rec {
++ plugins;
optional-dependencies = {
mysql = with python.pkgs; [
mysqlclient
];
postgres = with python.pkgs; [
psycopg2
];
pkgs/by-name/pr/pretalx/plugins/downstream.nix
+2 -2
View File
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pretalx-downstream";
version = "1.3.0";
version = "1.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "pretalx";
repo = "pretalx-downstream";
rev = "v${version}";
hash = "sha256-xpacfU655vg6g1rD4uteeizj+Bll4fgI0AEddaGiCLE=";
hash = "sha256-Q9519jNKQUeNCHg3ivjYyQm1ePMxp/bhtcJAselQiiM=";
};
build-system = [ setuptools ];
pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix
+2 -2
View File
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pretalx-media-ccc-de";
version = "1.3.0";
version = "1.4.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pretalx";
repo = "pretalx-media-ccc-de";
rev = "v${version}";
hash = "sha256-Cr9qbkb1VOH2EtDLSA5jmLiCnn1ICdvHnmTugCvHLc0=";
hash = "sha256-U+26hit4xXUzN8JT3WL+iGohqomX1ENb+ihM9IT1XWQ=";
};
build-system = [ setuptools ];
pkgs/by-name/pr/pretalx/plugins/pages.nix
+2 -2
View File
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pretalx-pages";
version = "1.5.0";
version = "1.6.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pretalx";
repo = "pretalx-pages";
rev = "v${version}";
hash = "sha256-wLMl+2hAJQksCyeBnXxMIFh1/Qkosm7PqByW6QxMsyg=";
hash = "sha256-9ZJSW6kdxpwHd25CuGTE4MMXylXaZKL3eAEKKdYiuXs=";
};
build-system = [ setuptools ];
pkgs/by-name/pr/pretalx/plugins/public-voting.nix
+2 -2
View File
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pretalx-public-voting";
version = "1.6.0";
version = "1.7.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pretalx";
repo = "pretalx-public-voting";
rev = "v${version}";
hash = "sha256-1zxJ1b2CHfV2AVAneUJxurZ0L3QoMzuBf8c2wrj7yBA=";
hash = "sha256-ei6GgPPEXv9WVhh+4U+WDFCMsT4bND9O85cPLpPWMhQ=";
};
build-system = [ setuptools ];
pkgs/by-name/pr/pretalx/plugins/venueless.nix
+2 -2
View File
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "pretalx-venueless";
version = "1.4.0";
version = "1.5.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pretalx";
repo = "pretalx-venueless";
rev = "v${version}";
hash = "sha256-llgRa18hxVoRSwU5UH6w4sE2W5ozCZm4Btbia2y0LbE=";
hash = "sha256-1YWkyTaImnlGXZWrborvJrx8zc1FOZD/ugOik7S+fC8=";
};
nativeBuildInputs = [ gettext ];
pkgs/by-name/pr/pretalx/plugins/vimeo.nix
+2 -2
View File
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pretalx-vimeo";
version = "2.3.0";
version = "2.4.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pretalx";
repo = "pretalx-vimeo";
rev = "v${version}";
hash = "sha256-ZlF/wWD5FaC4CfYIYvcbykPajoCOotmmaY+rQ0sGAo8=";
hash = "sha256-MwAKmPQif2wLy03II1t87lIdIf2th4BteaAo5pACjLE=";
};
build-system = [ setuptools ];
pkgs/by-name/pr/pretalx/plugins/youtube.nix
+2 -2
View File
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pretalx-youtube";
version = "2.2.0";
version = "2.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pretalx";
repo = "pretalx-youtube";
rev = "v${version}";
hash = "sha256-cTxkFSK84NRn7Z2uWYBJ2NvQ3pOsUbdZDg6XE5yswPg=";
hash = "sha256-5vQPFW0qABKQjFUvjMrtmIGEpMzLLbAOBA4GFqqBNw0=";
};
build-system = [ setuptools ];
pkgs/by-name/pr/pretix/package.nix
+1
View File
@@ -98,6 +98,7 @@ python.pkgs.buildPythonApplication rec {
"protobuf"
"pyjwt"
"python-bidi"
"qrcode"
"requests"
"sentry-sdk"
];
pkgs/by-name/we/weblate/package.nix
+6 -2
View File
@@ -44,8 +44,12 @@ python.pkgs.buildPythonApplication rec {
hash = "sha256-cIwCNYXbg7l6z9OAkMAGJ783QI/nCOyrhLPURDcDv+Y=";
};
# https://github.com/WeblateOrg/weblate/commit/1cf2a423b20fcd2dde18a43277311334e38208e7
pythonRelaxDeps = [ "rapidfuzz" ];
pythonRelaxDeps = [
# https://github.com/WeblateOrg/weblate/commit/9695f912b0d24ae999d9442bb49719b4bb552696
"qrcode"
# https://github.com/WeblateOrg/weblate/commit/1cf2a423b20fcd2dde18a43277311334e38208e7
"rapidfuzz"
];
patches = [
# FIXME This shouldn't be necessary and probably has to do with some dependency mismatch.
pkgs/development/python-modules/django-two-factor-auth/default.nix
+6 -5
View File
@@ -29,13 +29,14 @@ buildPythonPackage rec {
hash = "sha256-Sr7L3ioeofyADHb1NSgs0GmVbzX7rro7yhhG9Gq6GJE=";
};
nativeBuildInputs = [
setuptools-scm
build-system = [ setuptools-scm ];
pythonRelaxDeps = [
"django-phonenumber-field"
"qrcode"
];
pythonRelaxDeps = [ "django-phonenumber-field" ];
propagatedBuildInputs = [
dependencies = [
django
django-formtools
django-otp
pkgs/development/python-modules/flet/default.nix
+1
View File
@@ -41,6 +41,7 @@ buildPythonPackage rec {
pythonRelaxDeps = [
"cookiecutter"
"packaging"
"qrcode"
"watchdog"
"websockets"
];
pkgs/development/python-modules/qrcode/default.nix
+21 -16
View File
@@ -2,42 +2,47 @@
lib,
buildPythonPackage,
fetchPypi,
mock,
pythonAtLeast,
# build-system
poetry-core,
# dependencies
pillow,
pypng,
# tests
mock,
pytestCheckHook,
pythonAtLeast,
qrcode,
setuptools,
testers,
typing-extensions,
}:
buildPythonPackage rec {
pname = "qrcode";
version = "7.4.2";
version = "8.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-ndlpRUgn4Sfb2TaWsgdHI55tVA4IKTfJDxSslbMPWEU=";
hash = "sha256-AlzisVD3/kKW0Rbum61FWmZDq09ufc5UFhOkdYy840c=";
};
nativeBuildInputs = [ setuptools ];
build-system = [ poetry-core ];
propagatedBuildInputs = [
typing-extensions
pypng
# imports pkg_resouces in console_scripts.py
setuptools
];
optional-dependencies.pil = [ pillow ];
optional-dependencies = {
pil = [ pillow ];
png = [ pypng ];
all = [
pypng
pillow
];
};
nativeCheckInputs = [
mock
pytestCheckHook
] ++ optional-dependencies.pil;
] ++ lib.flatten (lib.attrValues optional-dependencies);
passthru.tests = {
version = testers.testVersion {