From 4121c1b5c7137a66b0b45f22388bb7cfeb791059 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 Jul 2024 15:55:44 +0000 Subject: [PATCH 1/2] trytond: 7.2.4 -> 7.2.5 --- pkgs/development/python-modules/trytond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index e70bfcdc802d..91f7e40b9e47 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "7.2.4"; + version = "7.2.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iYx9qpZmf2r8Ndynx+jyyrLnAmB56NgjleUoLtyz+20="; + hash = "sha256-ph3S7lwilGMk9tXxmZDIglpLfGmGHV1Dhj4oA8FLjws="; }; propagatedBuildInputs = From 10b4d2f885c530f6ba10ebf7a2c9808e2e907990 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 5 Jul 2024 11:56:13 +0900 Subject: [PATCH 2/2] trytond: refactor --- pkgs/development/python-modules/trytond/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 91f7e40b9e47..78080fd1e9cb 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchPypi, pythonOlder, + setuptools, defusedxml, lxml, relatorio, @@ -12,7 +13,6 @@ polib, python-sql, werkzeug, - wrapt, passlib, pydot, levenshtein, @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "trytond"; version = "7.2.5"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -37,7 +37,9 @@ buildPythonPackage rec { hash = "sha256-ph3S7lwilGMk9tXxmZDIglpLfGmGHV1Dhj4oA8FLjws="; }; - propagatedBuildInputs = + build-system = [ setuptools ]; + + dependencies = [ defusedxml lxml @@ -47,7 +49,6 @@ buildPythonPackage rec { polib python-sql werkzeug - wrapt passlib # extra dependencies