diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 7c81b57c8346..38c172057e2a 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -3,6 +3,7 @@ buildNpmPackage, fetchFromGitHub, fetchPypi, + libredirect, nodejs, python312, gettext, @@ -42,13 +43,13 @@ let }; pname = "pretix"; - version = "2025.10.1"; + version = "2026.1.0"; src = fetchFromGitHub { owner = "pretix"; repo = "pretix"; tag = "v${version}"; - hash = "sha256-O9HAslZ8xbmLgJi3y91M6mc1oIvJZ8nRJyFRuNorRHs="; + hash = "sha256-XS4Kqgvg3Bu5S3gFJ4fvvezCtQEA26jUa+8pSx2saNw="; }; npmDeps = buildNpmPackage { @@ -247,6 +248,7 @@ python.pkgs.buildPythonApplication rec { nativeCheckInputs = with python.pkgs; [ + libredirect.hook pytestCheckHook pytest-xdist pytest-mock @@ -271,6 +273,13 @@ python.pkgs.buildPythonApplication rec { preCheck = '' export PYTHONPATH=$(pwd)/src:$PYTHONPATH export DJANGO_SETTINGS_MODULE=tests.settings + + echo "nameserver 127.0.0.1" > resolv.conf + export NIX_REDIRECTS=/etc/resolv.conf=$(realpath resolv.conf) + ''; + + postCheck = '' + unset NIX_REDIRECTS ''; passthru = { diff --git a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix index 037a94a8fde5..8e19abf81e22 100644 --- a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix +++ b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pretix-mollie"; - version = "2.5.0"; + version = "2.5.1"; pyproject = true; src = fetchFromGitHub { owner = "pretix"; repo = "pretix-mollie"; tag = "v${version}"; - hash = "sha256-lQ1y6w7zP0sy67jf5+K6584DP10LAZqo1hLsHF3H2UA="; + hash = "sha256-SpSXHPPxwI36iz5b8naD60vTomc52U84LjeeV8OnJXo="; }; build-system = [ diff --git a/pkgs/by-name/pr/pretix/plugins/payone/package.nix b/pkgs/by-name/pr/pretix/plugins/payone/package.nix new file mode 100644 index 000000000000..02f4c23a4fd6 --- /dev/null +++ b/pkgs/by-name/pr/pretix/plugins/payone/package.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pretix-plugin-build, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "pretix-payone"; + version = "1.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pretix"; + repo = "pretix-payone"; + rev = "v${finalAttrs.version}"; + hash = "sha256-8DXORej+OJ65l/KGcanavHU4rabK9qTSnRPbdCidkgQ="; + }; + + build-system = [ + pretix-plugin-build + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pretix_payone" + ]; + + meta = { + description = "Pretix payment plugin for PAYONE"; + homepage = "https://github.com/pretix/pretix-payone"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hexa ]; + }; +}) diff --git a/pkgs/by-name/pr/pretix/plugins/worldlinedirect/package.nix b/pkgs/by-name/pr/pretix/plugins/worldlinedirect/package.nix new file mode 100644 index 000000000000..d2de73989ff0 --- /dev/null +++ b/pkgs/by-name/pr/pretix/plugins/worldlinedirect/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pretix-plugin-build, + setuptools, + onlinepayments-sdk-python3, +}: + +buildPythonPackage rec { + pname = "pretix-worldlinedirect"; + version = "1.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pretix"; + repo = "pretix-worldlinedirect"; + rev = "v${version}"; + hash = "sha256-ofDGbRYTA2GTnVexn0dE6Iftq6+MkigOXWVR4kPUJzY="; + }; + + build-system = [ + pretix-plugin-build + setuptools + ]; + + dependencies = [ + onlinepayments-sdk-python3 + ]; + + pythonImportsCheck = [ + "pretix_payonegopay" + "pretix_worldlinedirect" + ]; + + meta = { + description = "A pretix plugin to accept payments through Worldline Direct"; + homepage = "https://github.com/pretix/pretix-worldlinedirect"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix index 1ac076d03b3a..3380a91b0690 100644 --- a/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix +++ b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pretix-zugferd"; - version = "2.6.1"; + version = "2.6.2"; pyproject = true; src = fetchFromGitHub { owner = "pretix"; repo = "pretix-zugferd"; rev = "v${version}"; - hash = "sha256-nLpzNx/k1pJsYgMBhMkEOKfHmB46/AOzxB59cYkrGUU="; + hash = "sha256-C2Z/S3lEKmdi6fch/erjPc9evnKc69tBRTInXRgi24E="; }; postPatch = '' diff --git a/pkgs/development/python-modules/django-countries/default.nix b/pkgs/development/python-modules/django-countries/default.nix index 3d83eaf4dfe4..e79d314f2545 100644 --- a/pkgs/development/python-modules/django-countries/default.nix +++ b/pkgs/development/python-modules/django-countries/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - setuptools, + uv-build, # dependencies asgiref, @@ -20,17 +20,17 @@ buildPythonPackage rec { pname = "django-countries"; - version = "7.6.1"; + version = "8.2.0"; pyproject = true; src = fetchFromGitHub { owner = "SmileyChris"; repo = "django-countries"; tag = "v${version}"; - hash = "sha256-IR9cJbDVkZrcF3Ti70mV8VeXINQDK8OpwUTWVjD4Zn0="; + hash = "sha256-MtRlZFrTlY7t0n08X0aYN5HRGZUGLHkcU1gaZCtj07Q="; }; - build-system = [ setuptools ]; + build-system = [ uv-build ]; dependencies = [ asgiref @@ -52,7 +52,7 @@ buildPythonPackage rec { forms, flag icons static files, and a country field for models. ''; homepage = "https://github.com/SmileyChris/django-countries"; - changelog = "https://github.com/SmileyChris/django-countries/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/SmileyChris/django-countries/blob/v${version}/CHANGES.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/onlinepayments-sdk-python3/default.nix b/pkgs/development/python-modules/onlinepayments-sdk-python3/default.nix new file mode 100644 index 000000000000..b49d51be5f1d --- /dev/null +++ b/pkgs/development/python-modules/onlinepayments-sdk-python3/default.nix @@ -0,0 +1,57 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + requests, + requests-toolbelt, + mockito, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "onlinepayments-sdk-python3"; + version = "4.23.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "wl-online-payments-direct"; + repo = "sdk-python3"; + rev = finalAttrs.version; + hash = "sha256-IX9kiM5ZtX4uzW+D+Bbt8535CqMtdTtv0mpDo5Swstg="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + requests + requests-toolbelt + ]; + + nativeCheckInputs = [ + mockito + pytestCheckHook + ]; + + disabledTestPaths = [ + # requires api key + "tests/integration" + ]; + + disabledTests = [ + # missing fixtures + "testConnection_request" + "testConnection_response" + ]; + + pythonImportsCheck = [ + "onlinepayments" + ]; + + meta = { + description = "SDK to communicate with the Online Payments platform using the Online Payments Server API"; + homepage = "https://github.com/wl-online-payments-direct/sdk-python3"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e77a8185f943..f7c9df6a801f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11249,6 +11249,10 @@ self: super: with self; { callPackage ../development/python-modules/online-judge-verify-helper { }; + onlinepayments-sdk-python3 = + callPackage ../development/python-modules/onlinepayments-sdk-python3 + { }; + onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { }; onnx = callPackage ../development/python-modules/onnx {