Commit c9951ad8 authored by Bruno BELANYI's avatar Bruno BELANYI
Browse files

mealie: 3.3.2 -> 3.5.0

parent 5d444e2f
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ stdenv.mkDerivation {

  yarnOfflineCache = fetchYarnDeps {
    yarnLock = "${src}/frontend/yarn.lock";
    hash = "sha256-vw7OtXRrASOac4J5j6X/U2kxZa9I9thecUUl6XOYz5w=";
    hash = "sha256-qwxsnl9xKzNJEomMB4p8eaiybmlpeUgSUpJtIRhF1Cw=";
  };

  nativeBuildInputs = [
+54 −38
Original line number Diff line number Diff line
@@ -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,7 +37,9 @@ pythonpkgs.buildPythonApplication rec {

  pythonRelaxDeps = true;

  dependencies = with pythonpkgs; [
  dependencies =
    with pythonpkgs;
    [
      aiofiles
      alembic
      aniso8601
@@ -45,18 +47,23 @@ pythonpkgs.buildPythonApplication rec {
      apprise
      authlib
      bcrypt
      beautifulsoup4
      extruct
      fastapi
      html2text
      httpx
      ingredient-parser-nlp
      isodate
      itsdangerous
      jinja2
      lxml
      openai
      orjson
      paho-mqtt
      pillow
      pillow-heif
    psycopg2
      psycopg2 # pgsql optional-dependencies
      pydantic
      pydantic-settings
      pyhumps
      pyjwt
@@ -68,10 +75,14 @@ pythonpkgs.buildPythonApplication rec {
      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,6 +123,11 @@ pythonpkgs.buildPythonApplication rec {
    export NLTK_DATA=${nltk-data.averaged-perceptron-tagger-eng}
  '';

  disabledTests = [
    # pydantic_core._pydantic_core.ValidationError: 1 validation error
    "test_pg_connection_url_encode_password"
  ];

  disabledTestPaths = [
    # KeyError: 'alembic_version'
    "tests/unit_tests/services_tests/backup_v2_tests/test_backup_v2.py"