From f5f70ee8a96e62e338450befebb1151ddbb6a115 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 11 Jan 2026 20:48:28 +0100 Subject: [PATCH] odoo{17,18,}: use pyproject = true, update dependency list --- pkgs/by-name/od/odoo/package.nix | 25 +++++++++++++----------- pkgs/by-name/od/odoo17/package.nix | 27 +++++++++++++------------- pkgs/by-name/od/odoo18/package.nix | 31 +++++++++++++++--------------- 3 files changed, 43 insertions(+), 40 deletions(-) diff --git a/pkgs/by-name/od/odoo/package.nix b/pkgs/by-name/od/odoo/package.nix index f2e18785810f..2de0d3e4d2ff 100644 --- a/pkgs/by-name/od/odoo/package.nix +++ b/pkgs/by-name/od/odoo/package.nix @@ -17,8 +17,7 @@ in python.pkgs.buildPythonApplication rec { pname = "odoo"; version = "${odoo_version}.${odoo_release}"; - - format = "setuptools"; + pyproject = true; src = fetchzip { # find latest version on https://nightly.odoo.com/${odoo_version}/nightly/src @@ -28,22 +27,25 @@ python.pkgs.buildPythonApplication rec { }; makeWrapperArgs = [ - "--prefix" - "PATH" - ":" - "${lib.makeBinPath [ - wkhtmltopdf - rtlcss - ]}" + "--prefix PATH : ${ + lib.makeBinPath [ + wkhtmltopdf + rtlcss + ] + }" ]; - propagatedBuildInputs = with python.pkgs; [ + build-system = with python.pkgs; [ + setuptools + distutils + ]; + + dependencies = with python.pkgs; [ asn1crypto babel cbor2 chardet cryptography - distutils docutils freezegun geoip2 @@ -57,6 +59,7 @@ python.pkgs.buildPythonApplication rec { markupsafe num2words ofxparse + openpyxl passlib pillow polib diff --git a/pkgs/by-name/od/odoo17/package.nix b/pkgs/by-name/od/odoo17/package.nix index ac5db5d4ff76..74358118c520 100644 --- a/pkgs/by-name/od/odoo17/package.nix +++ b/pkgs/by-name/od/odoo17/package.nix @@ -31,8 +31,7 @@ in python.pkgs.buildPythonApplication rec { pname = "odoo"; version = "${odoo_version}.${odoo_release}"; - - format = "setuptools"; + pyproject = true; # latest release is at https://github.com/odoo/docker/blob/master/17.0/Dockerfile src = fetchzip { @@ -48,23 +47,24 @@ python.pkgs.buildPythonApplication rec { ]; makeWrapperArgs = [ - "--prefix" - "PATH" - ":" - "${lib.makeBinPath [ - wkhtmltopdf - rtlcss - ]}" + "--prefix PATH : ${ + lib.makeBinPath [ + wkhtmltopdf + rtlcss + ] + }" ]; - propagatedBuildInputs = with python.pkgs; [ + build-system = with python.pkgs; [ + setuptools + ]; + + dependencies = with python.pkgs; [ babel chardet cryptography decorator docutils-0_17 # sphinx has a docutils requirement >= 18 - ebaysdk - freezegun geoip2 gevent greenlet @@ -102,8 +102,7 @@ python.pkgs.buildPythonApplication rec { xlwt zeep - setuptools - mock + setuptools # pkg_resources is imported during runtime ]; # takes 5+ minutes and there are not files to strip diff --git a/pkgs/by-name/od/odoo18/package.nix b/pkgs/by-name/od/odoo18/package.nix index ceef961f1fd8..4aae1d5e6d03 100644 --- a/pkgs/by-name/od/odoo18/package.nix +++ b/pkgs/by-name/od/odoo18/package.nix @@ -17,8 +17,7 @@ in python.pkgs.buildPythonApplication rec { pname = "odoo"; version = "${odoo_version}.${odoo_release}"; - - format = "setuptools"; + pyproject = true; src = fetchzip { # find latest version on https://nightly.odoo.com/${odoo_version}/nightly/src @@ -28,22 +27,27 @@ python.pkgs.buildPythonApplication rec { }; makeWrapperArgs = [ - "--prefix" - "PATH" - ":" - "${lib.makeBinPath [ - wkhtmltopdf - rtlcss - ]}" + "--prefix PATH : ${ + lib.makeBinPath [ + wkhtmltopdf + rtlcss + ] + }" ]; - propagatedBuildInputs = with python.pkgs; [ + build-system = with python.pkgs; [ + setuptools + distutils + ]; + + dependencies = with python.pkgs; [ + asn1crypto babel + cbor2 chardet cryptography decorator docutils - distutils ebaysdk freezegun geoip2 @@ -53,10 +57,10 @@ python.pkgs.buildPythonApplication rec { jinja2 libsass lxml - lxml-html-clean markupsafe num2words ofxparse + openpyxl passlib pillow polib @@ -82,9 +86,6 @@ python.pkgs.buildPythonApplication rec { xlsxwriter xlwt zeep - - setuptools - mock ]; # takes 5+ minutes and there are not files to strip