From 34e7279caeefc2815fdb155658b97b6524a89cd7 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Wed, 25 Sep 2024 14:25:59 +0530 Subject: [PATCH] odoo15: update and enable tests Signed-off-by: phanirithvij --- pkgs/by-name/od/odoo15/package.nix | 44 ++++++++++++------------------ 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/pkgs/by-name/od/odoo15/package.nix b/pkgs/by-name/od/odoo15/package.nix index ca2a1444a02c..60d1d89b6385 100644 --- a/pkgs/by-name/od/odoo15/package.nix +++ b/pkgs/by-name/od/odoo15/package.nix @@ -1,13 +1,20 @@ -{ lib, fetchFromGitHub, fetchzip, python310, rtlcss, wkhtmltopdf -, nixosTests }: +{ lib +, fetchFromGitHub +, fetchzip +, python310 +, rtlcss +, wkhtmltopdf +, nixosTests +}: let + odoo_version = "15.0"; + odoo_release = "20241010"; python = python310.override { self = python; packageOverrides = self: super: { pypdf2 = super.pypdf2.overridePythonAttrs (old: rec { version = "1.28.6"; - format = "setuptools"; src = fetchFromGitHub { owner = "py-pdf"; @@ -17,43 +24,25 @@ let hash = "sha256-WnRbsy/PJcotZqY9mJPLadrYqkXykOVifLIbDyNf4s4="; }; + dependencies = [ self.setuptools ]; + nativeCheckInputs = with self; [ pytestCheckHook pillow ]; }); - flask = super.flask.overridePythonAttrs (old: rec { - version = "2.1.3"; - src = old.src.override { - inherit version; - hash = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss="; - }; - }); - werkzeug = super.werkzeug.overridePythonAttrs (old: rec { - version = "2.1.2"; - src = old.src.override { - inherit version; - hash = "sha256-HOCOgJPtZ9Y41jh5/Rujc1gX96gN42dNKT9ZhPJftuY="; - }; - }); }; }; - - odoo_version = "15.0"; - odoo_release = "20230816"; in python.pkgs.buildPythonApplication rec { - pname = "odoo15"; + pname = "odoo"; version = "${odoo_version}.${odoo_release}"; format = "setuptools"; - # latest release is at https://github.com/odoo/docker/blob/master/15.0/Dockerfile + # latest release is at https://github.com/odoo/docker/blob/5fb6a842747c296099d9384587cd89640eb7a615/15.0/Dockerfile#L58 src = fetchzip { url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip"; - name = "${pname}-${version}"; - hash = "sha256-h81JA0o44DVtl/bZ52rGQfg54TigwQcNpcMjQbi0zIQ="; # odoo + name = "odoo-${version}"; + hash = "sha256-Hkre6mghEiLrDwfB1BxGbqEm/zruHLwaS+eIFQKjl1o="; # odoo }; - # needs some investigation - doCheck = false; - makeWrapperArgs = [ "--prefix" "PATH" @@ -74,6 +63,7 @@ in python.pkgs.buildPythonApplication rec { jinja2 libsass lxml + lxml-html-clean markupsafe mock num2words