diff --git a/pkgs/by-name/me/mealie/mealie-frontend.nix b/pkgs/by-name/me/mealie/mealie-frontend.nix index ab0071c564cb..ec28d8e12f07 100644 --- a/pkgs/by-name/me/mealie/mealie-frontend.nix +++ b/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 = [ diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix index 821f833b530b..9744e913d3c2 100644 --- a/pkgs/by-name/me/mealie/package.nix +++ b/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; [ - aiofiles - alembic - aniso8601 - appdirs - apprise - authlib - bcrypt - fastapi - html2text - httpx - ingredient-parser-nlp - itsdangerous - jinja2 - lxml - openai - orjson - paho-mqtt - pillow-heif - psycopg2 - pydantic-settings - pyhumps - pyjwt - python-dateutil - python-dotenv - python-ldap - python-multipart - python-slugify - pyyaml - rapidfuzz - recipe-scrapers - sqlalchemy - tzdata - uvicorn - ]; + dependencies = + with pythonpkgs; + [ + aiofiles + alembic + aniso8601 + appdirs + apprise + authlib + bcrypt + beautifulsoup4 + extruct + fastapi + html2text + httpx + ingredient-parser-nlp + isodate + itsdangerous + jinja2 + lxml + openai + orjson + paho-mqtt + pillow + pillow-heif + psycopg2 # pgsql optional-dependencies + pydantic + pydantic-settings + pyhumps + pyjwt + python-dateutil + python-dotenv + python-ldap + 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 = [ - # KeyError: 'alembic_version' - "tests/unit_tests/services_tests/backup_v2_tests/test_backup_v2.py" - "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" + disabledTests = [ + # pydantic_core._pydantic_core.ValidationError: 1 validation error + "test_pg_connection_url_encode_password" ]; passthru = { diff --git a/pkgs/development/python-modules/ingredient-parser-nlp/default.nix b/pkgs/development/python-modules/ingredient-parser-nlp/default.nix index 652de92fcedc..1e103c9f4252 100644 --- a/pkgs/development/python-modules/ingredient-parser-nlp/default.nix +++ b/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 ];