mealie: 3.3.2 -> 3.5.0 (#461641)

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

@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/frontend/yarn.lock";
-    hash = "sha256-vw7OtXRrASOac4J5j6X/U2kxZa9I9thecUUl6XOYz5w=";
+    hash = "sha256-qwxsnl9xKzNJEomMB4p8eaiybmlpeUgSUpJtIRhF1Cw=";
   };
 
   nativeBuildInputs = [

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

@@ -11,12 +11,12 @@
 }:
 
 let
-  version = "3.3.2";
+  version = "3.5.0";
   src = fetchFromGitHub {
     owner = "mealie-recipes";
     repo = "mealie";
     tag = "v${version}";
-    hash = "sha256-iaddAIsrUH6g4KXuSTIulNVWOfy/IWg0Czs9JgDxXUk=";
+    hash = "sha256-rZOmu2xplIyMgX0uk5XCKf79qWfftHVELYNXdlzYkrY=";
   };
 
   frontend = callPackage (import ./mealie-frontend.nix src version) { };
@@ -29,7 +29,7 @@ pythonpkgs.buildPythonApplication rec {
   inherit version src;
   pyproject = true;
 
-  build-system = with pythonpkgs; [ poetry-core ];
+  build-system = with pythonpkgs; [ setuptools ];
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -37,41 +37,52 @@ pythonpkgs.buildPythonApplication rec {
 
   pythonRelaxDeps = true;
 
-  dependencies = with pythonpkgs; [
+  dependencies =
-    aiofiles
+    with pythonpkgs;
-    alembic
+    [
-    aniso8601
+      aiofiles
-    appdirs
+      alembic
-    apprise
+      aniso8601
-    authlib
+      appdirs
-    bcrypt
+      apprise
-    fastapi
+      authlib
-    html2text
+      bcrypt
-    httpx
+      beautifulsoup4
-    ingredient-parser-nlp
+      extruct
-    itsdangerous
+      fastapi
-    jinja2
+      html2text
-    lxml
+      httpx
-    openai
+      ingredient-parser-nlp
-    orjson
+      isodate
-    paho-mqtt
+      itsdangerous
-    pillow-heif
+      jinja2
-    psycopg2
+      lxml
-    pydantic-settings
+      openai
-    pyhumps
+      orjson
-    pyjwt
+      paho-mqtt
-    python-dateutil
+      pillow
-    python-dotenv
+      pillow-heif
-    python-ldap
+      psycopg2 # pgsql optional-dependencies
-    python-multipart
+      pydantic
-    python-slugify
+      pydantic-settings
-    pyyaml
+      pyhumps
-    rapidfuzz
+      pyjwt
-    recipe-scrapers
+      python-dateutil
-    sqlalchemy
+      python-dotenv
-    tzdata
+      python-ldap
-    uvicorn
+      python-multipart
-  ];
+      python-slugify
+      pyyaml
+      rapidfuzz
+      recipe-scrapers
+      requests
+      sqlalchemy
+      text-unidecode
+      typing-extensions
+      tzdata
+      uvicorn
+    ]
+    ++ uvicorn.optional-dependencies.standard;
 
   postPatch = ''
     rm -rf dev # Do not need dev scripts & code
@@ -112,14 +123,9 @@ pythonpkgs.buildPythonApplication rec {
     export NLTK_DATA=${nltk-data.averaged-perceptron-tagger-eng}
   '';
 
-  disabledTestPaths = [
+  disabledTests = [
-    # KeyError: 'alembic_version'
+    # pydantic_core._pydantic_core.ValidationError: 1 validation error
-    "tests/unit_tests/services_tests/backup_v2_tests/test_backup_v2.py"
+    "test_pg_connection_url_encode_password"
-    "tests/unit_tests/services_tests/backup_v2_tests/test_alchemy_exporter.py"
-    # sqlite3.OperationalError: no such table
-    "tests/unit_tests/services_tests/scheduler/tasks/test_create_timeline_events.py"
-    "tests/unit_tests/test_ingredient_parser.py"
-    "tests/unit_tests/test_security.py"
   ];
 
   passthru = {

pkgs/development/python-modules/ingredient-parser-nlp/default.nix

@@ -15,14 +15,14 @@
 }:
 buildPythonPackage rec {
   pname = "ingredient-parser-nlp";
-  version = "2.3.0";
+  version = "2.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "strangetom";
     repo = "ingredient-parser";
     tag = version;
-    hash = "sha256-+Hd+NtInG3umo0unCQHw8rBDhuIM55VtkVXiD1tKNVo=";
+    hash = "sha256-E5YHLRtUKtokAc+QUpF4Pd7hOZyFx6IIB1AadyIRWpI=";
   };
 
   build-system = [ setuptools ];