From d5b6a16d74c9d2c940ee00958a85a469898f5cc8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 May 2025 17:45:09 +0200 Subject: [PATCH 1/6] python3Packages.drf-flex-fields: init at 1.0.2 --- .../drf-flex-fields/default.nix | 64 +++++++++++++++++++ .../drf-flex-fields/django4-compat.patch | 17 +++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 83 insertions(+) create mode 100644 pkgs/development/python-modules/drf-flex-fields/default.nix create mode 100644 pkgs/development/python-modules/drf-flex-fields/django4-compat.patch diff --git a/pkgs/development/python-modules/drf-flex-fields/default.nix b/pkgs/development/python-modules/drf-flex-fields/default.nix new file mode 100644 index 000000000000..5309cd811908 --- /dev/null +++ b/pkgs/development/python-modules/drf-flex-fields/default.nix @@ -0,0 +1,64 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + appdirs, + asgiref, + attrs, + black, + click, + django, + djangorestframework, + entrypoints, + flake8, + mccabe, + mypy, + mypy-extensions, + pycodestyle, + pyflakes, + pytz, + sqlparse, + toml, + typing-extensions, + + # tests + pytestCheckHook, + pytest-django, +}: + +buildPythonPackage rec { + pname = "drf-flex-fields"; + version = "1.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rsinger86"; + repo = "drf-flex-fields"; + tag = version; + hash = "sha256-+9ToxCEIDpsA+BK8Uk0VueVjoId41/S93+a716EGvCU="; + }; + + patches = [ ./django4-compat.patch ]; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ + django + djangorestframework + pytestCheckHook + pytest-django + ]; + + preCheck = '' + export DJANGO_SETTINGS_MODULE=tests.settings + ''; + + meta = { + changelog = "https://github.com/rsinger86/drf-flex-fields/releases/tag/${src.tag}"; + description = "Dynamically set fields and expand nested resources in Django REST Framework serializers"; + homepage = "https://github.com/rsinger86/drf-flex-fields"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/drf-flex-fields/django4-compat.patch b/pkgs/development/python-modules/drf-flex-fields/django4-compat.patch new file mode 100644 index 000000000000..2ed8fec43443 --- /dev/null +++ b/pkgs/development/python-modules/drf-flex-fields/django4-compat.patch @@ -0,0 +1,17 @@ +diff --git a/tests/urls.py b/tests/urls.py +index 998b0aa..62996c0 100644 +--- a/tests/urls.py ++++ b/tests/urls.py +@@ -1,4 +1,5 @@ +-from django.conf.urls import url, include ++from django.conf.urls import include ++from django.urls import re_path + from rest_framework import routers + from tests.testapp.views import PetViewSet, TaggedItemViewSet + +@@ -7,4 +8,4 @@ router = routers.DefaultRouter() + router.register(r"pets", PetViewSet, basename="pet") + router.register(r"tagged-items", TaggedItemViewSet, basename="tagged-item") + +-urlpatterns = [url(r"^", include(router.urls))] ++urlpatterns = [re_path(r"^", include(router.urls))] diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fbd80431a5b1..4e9257619529 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4201,6 +4201,8 @@ self: super: with self; { drf-extra-fields = callPackage ../development/python-modules/drf-extra-fields { }; + drf-flex-fields = callPackage ../development/python-modules/drf-flex-fields { }; + drf-jwt = callPackage ../development/python-modules/drf-jwt { }; drf-nested-routers = callPackage ../development/python-modules/drf-nested-routers { }; From 2bd507537eeb376d7a1e6a42d9af5b1f3d9cecca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 May 2025 17:46:52 +0200 Subject: [PATCH 2/6] python3Packages.zxcvbn: 4.4.28 -> 4.5.0 https://github.com/dwolfhub/zxcvbn-python/compare/refs/tags/v4.4.28...refs/tags/v4.5.0 --- pkgs/development/python-modules/zxcvbn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zxcvbn/default.nix b/pkgs/development/python-modules/zxcvbn/default.nix index 1c4708846e13..689d7dd3459f 100644 --- a/pkgs/development/python-modules/zxcvbn/default.nix +++ b/pkgs/development/python-modules/zxcvbn/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "zxcvbn"; - version = "4.4.28"; + version = "4.5.0"; format = "setuptools"; # no tests included in PyPI tarball @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "dwolfhub"; repo = "zxcvbn-python"; tag = "v${version}"; - hash = "sha256-etcST7pxlpOH5Q9KtOPGf1vmnkyjEp6Cd5QCmBjW9Hc="; + hash = "sha256-0SVJkJMEMnZVMpamDVP02kMwWRSj5zGlrMYG9kn0aXQ="; }; nativeCheckInputs = [ pytestCheckHook ]; From 21d627b95467607149045add5a2d45e094286944 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 May 2025 17:48:33 +0200 Subject: [PATCH 3/6] pretalx: 2024.3.1 -> 2025.1.0 https://pretalx.com/p/news/releasing-pretalx-2025-1-0/ https://docs.pretalx.org/changelog/#2025.1.0 --- pkgs/by-name/pr/pretalx/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index 66afbf46c56f..a2dccadd422e 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -22,13 +22,13 @@ let }; }; - version = "2024.3.1"; + version = "2025.1.0"; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx"; rev = "v${version}"; - hash = "sha256-y3BsNmLh9M5NgDPURCjCGWYci40hYcQtDVqsu2HqPRU="; + hash = "sha256-BlPmrfHbpsLI8DCldzoRudpf7T4SUpJXQA5h9o4Thek="; }; meta = with lib; { @@ -48,7 +48,7 @@ let sourceRoot = "${src.name}/src/pretalx/frontend/schedule-editor"; - npmDepsHash = "sha256-i7awRuR7NxhpxN2IZuI01PsN6FjXht7BxTbB1k039HA="; + npmDepsHash = "sha256-8difCdoG7j75wqwuWA/VBRk9oTjsM0QqLnR0iLkd/FY="; npmBuildScript = "build"; @@ -79,6 +79,7 @@ python.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "beautifulsoup4" "bleach" "celery" "css-inline" @@ -106,8 +107,8 @@ python.pkgs.buildPythonApplication rec { beautifulsoup4 bleach celery - css-inline csscompressor + css-inline cssutils defusedcsv defusedxml @@ -124,6 +125,8 @@ python.pkgs.buildPythonApplication rec { django-libsass django-scopes djangorestframework + drf-flex-fields + drf-spectacular libsass markdown pillow From 88ccda128b17ee91394bc3ead4be941786d75a46 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 May 2025 17:49:53 +0200 Subject: [PATCH 4/6] pretalx.plugins.media-ccc-de: 1.4.0 -> 1.4.1 https://github.com/pretalx/pretalx-media-ccc-de/compare/v1.4.0...v1.4.1 --- pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix b/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix index c240be878ad1..ce8225a2d3d7 100644 --- a/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix +++ b/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-media-ccc-de"; - version = "1.4.0"; + version = "1.4.1"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-media-ccc-de"; rev = "v${version}"; - hash = "sha256-U+26hit4xXUzN8JT3WL+iGohqomX1ENb+ihM9IT1XWQ="; + hash = "sha256-76hxS9cYvaRcToD8ooW0Fnp36+7n17j3UR1VD9v2zR8="; }; build-system = [ setuptools ]; From eecbe2995a2ba371ffe2d5d2e954e8dc24f0a49f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 May 2025 17:50:05 +0200 Subject: [PATCH 5/6] pretalx.plugins.pages: 1.6.0 -> 1.7.0 https://github.com/pretalx/pretalx-pages/compare/v1.6.0...v1.7.0 --- pkgs/by-name/pr/pretalx/plugins/pages.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/pr/pretalx/plugins/pages.nix b/pkgs/by-name/pr/pretalx/plugins/pages.nix index 76395ed666d2..6df8a7472148 100644 --- a/pkgs/by-name/pr/pretalx/plugins/pages.nix +++ b/pkgs/by-name/pr/pretalx/plugins/pages.nix @@ -1,20 +1,20 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchPypi, setuptools, }: buildPythonPackage rec { pname = "pretalx-pages"; - version = "1.6.0"; + version = "1.7.0"; pyproject = true; - src = fetchFromGitHub { - owner = "pretalx"; - repo = "pretalx-pages"; - rev = "v${version}"; - hash = "sha256-9ZJSW6kdxpwHd25CuGTE4MMXylXaZKL3eAEKKdYiuXs="; + # TODO: https://github.com/pretalx/pretalx-pages/issues/6 + src = fetchPypi { + pname = "pretalx_pages"; + inherit version; + hash = "sha256-XFZS0FUzouZzVh9AADK5dnezFZiAWoBihD4C184+690="; }; build-system = [ setuptools ]; From 76530781c7c8a277b8d53ca996266e383c7b30b4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 May 2025 17:50:28 +0200 Subject: [PATCH 6/6] pretalx.plugins.public-voting: 1.7.0 -> 1.7.1 https://github.com/pretalx/pretalx-public-voting/compare/v1.7.0...v1.7.1 --- pkgs/by-name/pr/pretalx/plugins/public-voting.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/pretalx/plugins/public-voting.nix b/pkgs/by-name/pr/pretalx/plugins/public-voting.nix index 993bfd6def88..b1dd574b98da 100644 --- a/pkgs/by-name/pr/pretalx/plugins/public-voting.nix +++ b/pkgs/by-name/pr/pretalx/plugins/public-voting.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-public-voting"; - version = "1.7.0"; + version = "1.7.1"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-public-voting"; rev = "v${version}"; - hash = "sha256-ei6GgPPEXv9WVhh+4U+WDFCMsT4bND9O85cPLpPWMhQ="; + hash = "sha256-8l+ugonT0WTHyyMJnU3Vi2QVD2Xxpl286m3YEKu+Ij4="; }; build-system = [ setuptools ];