From 4e9ed75a110d462fadbb0ced0fbf3c1d6be46a4d Mon Sep 17 00:00:00 2001 From: Phani Rithvij Date: Tue, 24 Sep 2024 17:37:17 +0530 Subject: [PATCH] odoo: update, fix update script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit odoo: enable tests Co-authored-by: Robert Schütz Signed-off-by: phanirithvij --- pkgs/by-name/od/odoo/package.nix | 7 ++----- pkgs/by-name/od/odoo/update.sh | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/od/odoo/package.nix b/pkgs/by-name/od/odoo/package.nix index fd3768bcd7428..121337998dd14 100644 --- a/pkgs/by-name/od/odoo/package.nix +++ b/pkgs/by-name/od/odoo/package.nix @@ -6,7 +6,7 @@ , wkhtmltopdf , nixosTests , odoo_version ? "17.0" -, odoo_release ? "20240610" +, odoo_release ? "20240925" }: let @@ -35,12 +35,9 @@ in python.pkgs.buildPythonApplication rec { # find latest version on https://nightly.odoo.com/${odoo_version}/nightly/src url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip"; name = "${pname}-${version}"; - hash = "sha256-blibGJyaz+MxMazOXhPbGBAJWZoGubirwSnjVYyLBJs="; # odoo + hash = "sha256-MY8dj0WJOEYVA99vdp+N/xMkUpX7/ThTcIFkhtRRbQA="; # odoo }; - # needs some investigation - doCheck = false; - makeWrapperArgs = [ "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf rtlcss ]}" ]; diff --git a/pkgs/by-name/od/odoo/update.sh b/pkgs/by-name/od/odoo/update.sh index e9c50ccb50815..4ddbf7d27bb85 100755 --- a/pkgs/by-name/od/odoo/update.sh +++ b/pkgs/by-name/od/odoo/update.sh @@ -21,6 +21,6 @@ fi cd "$(dirname "${BASH_SOURCE[0]}")" -sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch -q fetchzip --url "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.zip")\"; # odoo|g" package.nix +sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch -q fetchzip --option extra-experimental-features flakes --url "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.zip")\"; # odoo|g" package.nix sed -ri "s|, odoo_version \? .+|, odoo_version ? \"$VERSION\"|" package.nix sed -ri "s|, odoo_release \? .+|, odoo_release ? \"$RELEASE\"|" package.nix