From 0469c8e35d483bb1d6d381d0d2124f4e42660cd0 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Fri, 13 Oct 2023 09:09:45 +0200 Subject: [PATCH 1/2] odoo: 16.0.20230722 -> 16.0.20231024 --- pkgs/applications/finance/odoo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix index f00118fdf75a..abe4dff49f1e 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/applications/finance/odoo/default.nix @@ -45,7 +45,7 @@ let }; odoo_version = "16.0"; - odoo_release = "20230722"; + odoo_release = "20231024"; in python.pkgs.buildPythonApplication rec { pname = "odoo"; version = "${odoo_version}.${odoo_release}"; @@ -56,7 +56,7 @@ in python.pkgs.buildPythonApplication rec { src = fetchzip { url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip"; name = "${pname}-${version}"; - hash = "sha256-pSycpYSiqJ6DKENvCWwLz+JaPUXT5dmaq8x4Aency60="; # odoo + hash = "sha256-Ux8RfA7kWLKissBBY5wrfL+aKKw++5BxjP3Vw0JAOsk="; # odoo }; # needs some investigation From a7ded1859c0ec8a77d11c0154284b025f9b30417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Mon, 30 Oct 2023 15:42:34 +0100 Subject: [PATCH 2/2] odoo: update dependencies --- pkgs/applications/finance/odoo/default.nix | 31 +++++++--------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix index abe4dff49f1e..c10e0d43686f 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/applications/finance/odoo/default.nix @@ -11,34 +11,18 @@ let python = python310.override { packageOverrides = self: super: { - pypdf2 = super.pypdf2.overridePythonAttrs (old: rec { - version = "1.28.6"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "py-pdf"; - repo = "pypdf"; - rev = version; - fetchSubmodules = true; - hash = "sha256-WnRbsy/PJcotZqY9mJPLadrYqkXykOVifLIbDyNf4s4="; - }; - - nativeBuildInputs = []; - - nativeCheckInputs = with self; [ pytestCheckHook pillow ]; - }); flask = super.flask.overridePythonAttrs (old: rec { - version = "2.1.3"; + version = "2.3.3"; src = old.src.override { inherit version; - hash = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss="; + hash = "sha256-CcNHqSqn/0qOfzIGeV8w2CZlS684uHPQdEzVccpgnvw="; }; }); werkzeug = super.werkzeug.overridePythonAttrs (old: rec { - version = "2.1.2"; + version = "2.3.7"; src = old.src.override { inherit version; - hash = "sha256-HOCOgJPtZ9Y41jh5/Rujc1gX96gN42dNKT9ZhPJftuY="; + hash = "sha256-K4wORHtLnbzIXdl7butNy69si2w74L1lTiVVPgohV9g="; }; }); }; @@ -69,6 +53,7 @@ in python.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python.pkgs; [ babel chardet + cryptography decorator docutils ebaysdk @@ -80,7 +65,6 @@ in python.pkgs.buildPythonApplication rec { libsass lxml markupsafe - mock num2words ofxparse passlib @@ -100,13 +84,16 @@ in python.pkgs.buildPythonApplication rec { qrcode reportlab requests - setuptools + urllib3 vobject werkzeug xlrd xlsxwriter xlwt zeep + + setuptools + mock ]; # takes 5+ minutes and there are not files to strip