From 934bfb6c36d141e2035d2c08472dd70936f0249a Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Wed, 19 Jun 2024 13:35:22 +0000 Subject: [PATCH] odoo: 17.0.20240507 -> 17.0.20240616 Make it possible to override 'odoo_version' and 'odoo_release' by moving them to the input attribute set with default values. Modify 'update.sh' so it correctly updates these defaults. Signed-off-by: Sirio Balmelli --- pkgs/by-name/od/odoo/package.nix | 6 +++--- pkgs/by-name/od/odoo/update.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/od/odoo/package.nix b/pkgs/by-name/od/odoo/package.nix index 45b0f85b5f7f..f2239bd5d59e 100644 --- a/pkgs/by-name/od/odoo/package.nix +++ b/pkgs/by-name/od/odoo/package.nix @@ -6,6 +6,8 @@ , rtlcss , wkhtmltopdf , nixosTests +, odoo_version ? "17.0" +, odoo_release ? "20240610" }: let @@ -23,8 +25,6 @@ let }); }; }; - odoo_version = "17.0"; - odoo_release = "20240507"; in python.pkgs.buildPythonApplication rec { pname = "odoo"; version = "${odoo_version}.${odoo_release}"; @@ -35,7 +35,7 @@ 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-WdJBs1YgJhHmD+ip6UU2pwXrcZCsbjgOGjrZTRFQBFw="; # odoo + hash = "sha256-blibGJyaz+MxMazOXhPbGBAJWZoGubirwSnjVYyLBJs="; # odoo }; # needs some investigation diff --git a/pkgs/by-name/od/odoo/update.sh b/pkgs/by-name/od/odoo/update.sh index dc64cb718b65..e9c50ccb5081 100755 --- a/pkgs/by-name/od/odoo/update.sh +++ b/pkgs/by-name/od/odoo/update.sh @@ -22,5 +22,5 @@ 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| odoo_version.+| odoo_version = \"$VERSION\";|" package.nix -sed -ri "s| odoo_release.+| odoo_release = \"$RELEASE\";|" package.nix +sed -ri "s|, odoo_version \? .+|, odoo_version ? \"$VERSION\"|" package.nix +sed -ri "s|, odoo_release \? .+|, odoo_release ? \"$RELEASE\"|" package.nix