From 2f23cfb7145a46abdacb0dd88d992396d45b55ee Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 17 Jun 2025 11:46:36 +0800 Subject: [PATCH 1/2] python312Packages.pwdlib: init at 0.2.1 --- .../python-modules/pwdlib/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/pwdlib/default.nix diff --git a/pkgs/development/python-modules/pwdlib/default.nix b/pkgs/development/python-modules/pwdlib/default.nix new file mode 100644 index 000000000000..53c1e226daeb --- /dev/null +++ b/pkgs/development/python-modules/pwdlib/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + hatch-regex-commit, + pytestCheckHook, + pytest-cov-stub, + argon2-cffi, + bcrypt, +}: + +buildPythonPackage rec { + pname = "pwdlib"; + version = "0.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "frankie567"; + repo = "pwdlib"; + tag = "v${version}"; + hash = "sha256-aPrgn5zfKk72QslGzb0acCNnZ7m3lyIBjvu4yhfZhSQ="; + }; + + build-system = [ + hatchling + hatch-regex-commit + ]; + + dependencies = [ + argon2-cffi + bcrypt + ]; + + pythonImportsCheck = [ "pwdlib" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; + + meta = { + description = "Modern password hashing for Python"; + changelog = "https://github.com/frankie567/pwdlib/releases/tag/v${version}"; + homepage = "https://github.com/frankie567/pwdlib"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ emaryn ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 36ecb5976625..ecab03765920 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11950,6 +11950,8 @@ self: super: with self; { pvo = callPackage ../development/python-modules/pvo { }; + pwdlib = callPackage ../development/python-modules/pwdlib { }; + pweave = callPackage ../development/python-modules/pweave { }; pwinput = callPackage ../development/python-modules/pwinput { }; From b14fc803384e6ffd78b0f4ebc81c8c36b0174c53 Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 17 Jun 2025 11:31:04 +0800 Subject: [PATCH 2/2] trytond: 7.4.10 -> 7.6.2 Changelog: https://foss.heptapod.net/tryton/tryton/-/blob/trytond-7.6.2/trytond/CHANGELOG?ref_type=tags --- .../python-modules/trytond/default.nix | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 7f2ae47dcb5b..faf5ca222917 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -20,21 +20,24 @@ weasyprint, gevent, pillow, + pwdlib, + simpleeval, withPostgresql ? true, psycopg2, unittestCheckHook, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "trytond"; - version = "7.4.10"; + version = "7.6.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kzoZDcHNPjmsNxrQ11MAksK+24nI1YNmONQd21s3weA="; + hash = "sha256-KD9gZ0ForX1iYQMYlsle2fJ+zlmQOymDf71p17aCr1k="; }; build-system = [ setuptools ]; @@ -58,16 +61,23 @@ buildPythonPackage rec { weasyprint gevent pillow + pwdlib + simpleeval ] ++ relatorio.optional-dependencies.fodt ++ passlib.optional-dependencies.bcrypt ++ passlib.optional-dependencies.argon2 ++ lib.optional withPostgresql psycopg2; - nativeCheckInputs = [ unittestCheckHook ]; + # Fontconfig error: Cannot load default config file: No such file: (null) + doCheck = false; + + nativeCheckInputs = [ + unittestCheckHook + writableTmpDirAsHomeHook + ]; preCheck = '' - export HOME=$(mktemp -d) export TRYTOND_DATABASE_URI="sqlite://" export DB_NAME=":memory:"; ''; @@ -77,7 +87,7 @@ buildPythonPackage rec { "trytond.tests" ]; - meta = with lib; { + meta = { description = "Server of the Tryton application platform"; longDescription = '' The server for Tryton, a three-tier high-level general purpose @@ -89,9 +99,9 @@ buildPythonPackage rec { ''; homepage = "http://www.tryton.org/"; changelog = "https://foss.heptapod.net/tryton/tryton/-/blob/trytond-${version}/trytond/CHANGELOG?ref_type=tags"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; broken = stdenv.hostPlatform.isDarwin; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ udono johbo ];