From 8306ac3d7e617a40e61438e1fa8b99a321bc7952 Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Wed, 19 Jun 2024 13:35:21 +0000 Subject: [PATCH] odoo: migrate to pkgs/by-name Remove original 'pkgs/applications/finance/odoo' directory. Update 'pkgs/applications/finance/odoo/update.sh' to point to the nightly builds archive for odoo, ignoring Docker. Signed-off-by: Sirio Balmelli --- pkgs/applications/finance/odoo/update.sh | 27 ------------------- .../od/odoo/package.nix} | 1 + pkgs/by-name/od/odoo/update.sh | 26 ++++++++++++++++++ .../od/odoo15/package.nix} | 0 .../od/odoo16/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 --- 6 files changed, 27 insertions(+), 31 deletions(-) delete mode 100755 pkgs/applications/finance/odoo/update.sh rename pkgs/{applications/finance/odoo/default.nix => by-name/od/odoo/package.nix} (96%) create mode 100755 pkgs/by-name/od/odoo/update.sh rename pkgs/{applications/finance/odoo/odoo15.nix => by-name/od/odoo15/package.nix} (100%) rename pkgs/{applications/finance/odoo/odoo16.nix => by-name/od/odoo16/package.nix} (100%) diff --git a/pkgs/applications/finance/odoo/update.sh b/pkgs/applications/finance/odoo/update.sh deleted file mode 100755 index 0f7ee144cf8a..000000000000 --- a/pkgs/applications/finance/odoo/update.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused nix coreutils nix-prefetch - -set -euo pipefail - -DOCKER=$(curl -s https://raw.githubusercontent.com/odoo/docker/master/16.0/Dockerfile) - -get_var() { - echo "$DOCKER" | grep -E "^[A-Z][A-Z][A-Z] ODOO_$1" | sed -r "s|^[A-Z]{3} ODOO_$1.||g" -} - -VERSION=$(get_var VERSION) -RELEASE=$(get_var RELEASE) - -latestVersion="$VERSION.$RELEASE" -currentVersion=$(nix-instantiate --eval -E "with import ./. {}; odoo.version or (lib.getVersion odoo)" | tr -d '"') - -if [[ "$currentVersion" == "$latestVersion" ]]; then - echo "odoo is up-to-date: $currentVersion" - exit 0 -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" default.nix -sed -ri "s| odoo_version.+| odoo_version = \"$VERSION\";|" default.nix -sed -ri "s| odoo_release.+| odoo_release = \"$RELEASE\";|" default.nix diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/by-name/od/odoo/package.nix similarity index 96% rename from pkgs/applications/finance/odoo/default.nix rename to pkgs/by-name/od/odoo/package.nix index df61e1c02f13..45b0f85b5f7f 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/by-name/od/odoo/package.nix @@ -32,6 +32,7 @@ in python.pkgs.buildPythonApplication rec { format = "setuptools"; src = fetchzip { + # 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 diff --git a/pkgs/by-name/od/odoo/update.sh b/pkgs/by-name/od/odoo/update.sh new file mode 100755 index 000000000000..dc64cb718b65 --- /dev/null +++ b/pkgs/by-name/od/odoo/update.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused nix coreutils nix-prefetch + +set -euo pipefail + +VERSION="17.0" # must be incremented manually + +RELEASE="$( + curl "https://nightly.odoo.com/$VERSION/nightly/src/" | + sed -nE 's/.*odoo_'"$VERSION"'.(20[0-9]{6}).tar.gz.*/\1/p' | + tail -n 1 +)" + +latestVersion="$VERSION.$RELEASE" +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; odoo.version or (lib.getVersion odoo)" | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "odoo is up-to-date: $currentVersion" + exit 0 +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 diff --git a/pkgs/applications/finance/odoo/odoo15.nix b/pkgs/by-name/od/odoo15/package.nix similarity index 100% rename from pkgs/applications/finance/odoo/odoo15.nix rename to pkgs/by-name/od/odoo15/package.nix diff --git a/pkgs/applications/finance/odoo/odoo16.nix b/pkgs/by-name/od/odoo16/package.nix similarity index 100% rename from pkgs/applications/finance/odoo/odoo16.nix rename to pkgs/by-name/od/odoo16/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2e5a4aed5ba..2629c3fb5d8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5968,10 +5968,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Security; }; - odoo = callPackage ../applications/finance/odoo { }; - odoo16 = callPackage ../applications/finance/odoo/odoo16.nix { }; - odoo15 = callPackage ../applications/finance/odoo/odoo15.nix { }; - odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter { }; oil-buku = callPackage ../applications/misc/oil-buku { };