mealie: 2.3.0 -> 2.6.0 (NixOS#382604)

Author: xanderio

pkgs/by-name/me/mealie/0000_openai_1.63.0.patch

@@ -0,0 +1,13 @@
+diff --git a/mealie/services/openai/openai.py b/mealie/services/openai/openai.py
+index 09c391d5..5d74d930 100644
+--- a/mealie/services/openai/openai.py
++++ b/mealie/services/openai/openai.py
+@@ -7,7 +7,7 @@ from pathlib import Path
+ from textwrap import dedent
+ 
+ from openai import NOT_GIVEN, AsyncOpenAI
+-from openai.resources.chat.completions import ChatCompletion
++from openai.types.chat import ChatCompletion
+ from pydantic import BaseModel, field_validator
+ 
+ from mealie.core.config import get_app_settings

pkgs/by-name/me/mealie/package.nix

@@ -1,20 +1,21 @@
-{ lib
-, stdenv
-, callPackage
-, fetchFromGitHub
-, makeWrapper
-, nixosTests
-, python3Packages
-, writeShellScript
+{
+  lib,
+  stdenv,
+  callPackage,
+  fetchFromGitHub,
+  makeWrapper,
+  nixosTests,
+  python3Packages,
+  writeShellScript,
 }:
 
 let
-  version = "2.3.0";
+  version = "2.6.0";
   src = fetchFromGitHub {
     owner = "mealie-recipes";
     repo = "mealie";
-    rev = "v${version}";
-    hash = "sha256-GN+uXyZCvDuFmQnXhn0mFans3bvvEw7Uq6V0OeCPEbE=";
+    tag = "v${version}";
+    hash = "sha256-txkHCQ/xTakPXXFki161jNOKwAH9p9z1hCNEEkbqQtM=";
   };
 
   frontend = callPackage (import ./mealie-frontend.nix src version) { };
@@ -54,6 +55,11 @@ pythonpkgs.buildPythonApplication rec {
 
   pythonRelaxDeps = true;
 
+  patches = [
+      # compatiblity with openai 1.63.0
+      ./0000_openai_1.63.0.patch
+  ];
+
   dependencies = with pythonpkgs; [
     aiofiles
     alembic
@@ -96,42 +102,32 @@ pythonpkgs.buildPythonApplication rec {
 
     substituteInPlace mealie/__init__.py \
       --replace-fail '__version__ = ' '__version__ = "v${version}" #'
-
-    substituteInPlace mealie/services/backups_v2/alchemy_exporter.py \
-      --replace-fail 'PROJECT_DIR = ' "PROJECT_DIR = Path('$out') #"
-
-    substituteInPlace mealie/db/init_db.py \
-      --replace-fail 'PROJECT_DIR = ' "PROJECT_DIR = Path('$out') #"
-
-    substituteInPlace mealie/services/backups_v2/alchemy_exporter.py \
-      --replace-fail '"script_location", path.join(PROJECT_DIR, "alembic")' '"script_location", "${src}/alembic"'
   '';
 
-  postInstall = let
-    start_script = writeShellScript "start-mealie" ''
-      ${lib.getExe pythonpkgs.gunicorn} "$@" -k uvicorn.workers.UvicornWorker mealie.app:app;
-    '';
-    init_db = writeShellScript "init-mealie-db" ''
-      ${python.interpreter} $OUT/${python.sitePackages}/mealie/scripts/install_model.py
-      ${python.interpreter} $OUT/${python.sitePackages}/mealie/db/init_db.py
+  postInstall =
+    let
+      start_script = writeShellScript "start-mealie" ''
+        ${lib.getExe pythonpkgs.gunicorn} "$@" -k uvicorn.workers.UvicornWorker mealie.app:app;
+      '';
+      init_db = writeShellScript "init-mealie-db" ''
+        ${python.interpreter} $OUT/${python.sitePackages}/mealie/scripts/install_model.py
+        ${python.interpreter} $OUT/${python.sitePackages}/mealie/db/init_db.py
+      '';
+    in
+    ''
+      mkdir -p $out/bin $out/libexec
+      rm -f $out/bin/*
+
+      makeWrapper ${start_script} $out/bin/mealie \
+        --set PYTHONPATH "$out/${python.sitePackages}:${pythonpkgs.makePythonPath dependencies}" \
+        --set LD_LIBRARY_PATH "${crfpp}/lib" \
+        --set STATIC_FILES "${frontend}" \
+        --set PATH "${lib.makeBinPath [ crfpp ]}"
+
+      makeWrapper ${init_db} $out/libexec/init_db \
+        --set PYTHONPATH "$out/${python.sitePackages}:${pythonpkgs.makePythonPath dependencies}" \
+        --set OUT "$out"
     '';
-  in ''
-    mkdir -p $out/bin $out/libexec
-    rm -f $out/bin/*
-
-    substitute ${src}/alembic.ini $out/alembic.ini \
-      --replace-fail 'script_location = alembic' 'script_location = ${src}/alembic'
-
-    makeWrapper ${start_script} $out/bin/mealie \
-      --set PYTHONPATH "$out/${python.sitePackages}:${pythonpkgs.makePythonPath dependencies}" \
-      --set LD_LIBRARY_PATH "${crfpp}/lib" \
-      --set STATIC_FILES "${frontend}" \
-      --set PATH "${lib.makeBinPath [ crfpp ]}"
-
-    makeWrapper ${init_db} $out/libexec/init_db \
-      --set PYTHONPATH "$out/${python.sitePackages}:${pythonpkgs.makePythonPath dependencies}" \
-      --set OUT "$out"
-  '';
 
   nativeCheckInputs = with pythonpkgs; [ pytestCheckHook ];
 
@@ -160,7 +156,10 @@ pythonpkgs.buildPythonApplication rec {
     homepage = "https://mealie.io";
     changelog = "https://github.com/mealie-recipes/mealie/releases/tag/${src.rev}";
     license = licenses.agpl3Only;
-    maintainers = with maintainers; [ litchipi anoa ];
+    maintainers = with maintainers; [
+      litchipi
+      anoa
+    ];
     mainProgram = "mealie";
   };
 }