diff --git a/pkgs/by-name/ta/tandoor-recipes/common.nix b/pkgs/by-name/ta/tandoor-recipes/common.nix index ad73275243ac..92ab353d10f0 100644 --- a/pkgs/by-name/ta/tandoor-recipes/common.nix +++ b/pkgs/by-name/ta/tandoor-recipes/common.nix @@ -1,15 +1,15 @@ { lib, fetchFromGitHub }: rec { - version = "1.5.35"; + version = "2.0.1"; src = fetchFromGitHub { owner = "TandoorRecipes"; repo = "recipes"; - rev = version; - hash = "sha256-pzujKBUNVILFrgsCWuYFvO48AYPbBpxS1im1dj7NpMw="; + tag = version; + hash = "sha256-tFnfuRYg9lq7hveGZqpRVHNaXxS6BUs88/BHnUXe4mA="; }; - yarnHash = "sha256-P8TqHa5t3oWEYUQDD7VrGTWHJ3y68OhQa3YzQpceJgw="; + yarnHash = "sha256-6+GmYibzujV1vE0FqMctGscRkrendpvczDdMK++qtTU="; meta = { homepage = "https://tandoor.dev/"; diff --git a/pkgs/by-name/ta/tandoor-recipes/frontend.nix b/pkgs/by-name/ta/tandoor-recipes/frontend.nix index 1e0735d15fe7..7b529ec5be6f 100644 --- a/pkgs/by-name/ta/tandoor-recipes/frontend.nix +++ b/pkgs/by-name/ta/tandoor-recipes/frontend.nix @@ -9,14 +9,14 @@ let common = callPackage ./common.nix { }; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "tandoor-recipes-frontend"; inherit (common) version; - src = "${common.src}/vue"; + src = "${common.src}/vue3"; yarnOfflineCache = fetchYarnDeps { - yarnLock = "${common.src}/vue/yarn.lock"; + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = common.yarnHash; }; @@ -50,8 +50,7 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall - cp -R ../cookbook/static/vue/ $out - cp webpack-stats.json $out + cp -R ../cookbook/static/vue3/ $out echo "${common.version}" > "$out/version" runHook postInstall @@ -60,4 +59,4 @@ stdenv.mkDerivation { meta = common.meta // { description = "Tandoor Recipes frontend"; }; -} +}) diff --git a/pkgs/by-name/ta/tandoor-recipes/package.nix b/pkgs/by-name/ta/tandoor-recipes/package.nix index 16beda51bee5..5b81e5df48ea 100644 --- a/pkgs/by-name/ta/tandoor-recipes/package.nix +++ b/pkgs/by-name/ta/tandoor-recipes/package.nix @@ -28,6 +28,10 @@ python.pkgs.buildPythonPackage { fi substituteInPlace pytest.ini --subst-var NIX_BUILD_CORES + + # The script name test tries to use django allauth for admin login + substituteInPlace cookbook/admin.py \ + --replace-fail "admin.site.login = secure_admin_login(admin.site.login)" "" ''; propagatedBuildInputs = with python.pkgs; [ @@ -37,7 +41,10 @@ python.pkgs.buildPythonPackage { django-cleanup django-crispy-forms django-tables2 + django-vite djangorestframework + drf-spectacular + drf-spectacular-sidecar drf-writable-nested django-oauth-toolkit bleach @@ -81,13 +88,16 @@ python.pkgs.buildPythonPackage { python3-openid python3-saml standard-imghdr + + # Tests + fido2 + litellm ]; configurePhase = '' runHook preConfigure - ln -sf ${frontend}/ cookbook/static/vue - cp ${frontend}/webpack-stats.json vue/ + ln -sf ${frontend}/ cookbook/static/vue3 runHook postConfigure ''; @@ -106,7 +116,6 @@ python.pkgs.buildPythonPackage { touch cookbook/static/themes/bootstrap.min.css.map touch cookbook/static/css/bootstrap-vue.min.css.map - ${python.pythonOnBuildForHost.interpreter} manage.py collectstatic_js_reverse ${python.pythonOnBuildForHost.interpreter} manage.py collectstatic runHook postBuild @@ -121,8 +130,7 @@ python.pkgs.buildPythonPackage { makeWrapper $out/lib/tandoor-recipes/manage.py $out/bin/tandoor-recipes \ --prefix PYTHONPATH : "$PYTHONPATH" - # usually copied during frontend build (see vue.config.js) - cp vue/src/sw.js $out/lib/tandoor-recipes/cookbook/templates/ + cp staticfiles/vue3/service-worker.js $out/lib/tandoor-recipes/cookbook/templates/ runHook postInstall ''; diff --git a/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch b/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch index 39b5acf00dea..4845110543e8 100644 --- a/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch +++ b/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch @@ -1,12 +1,14 @@ diff --git a/pytest.ini b/pytest.ini -index a3d26ec4..8bdf12fb 100644 +index 2755dc99..4026b96e 100644 --- a/pytest.ini +++ b/pytest.ini -@@ -3,5 +3,5 @@ DJANGO_SETTINGS_MODULE = recipes.test_settings +@@ -3,6 +3,6 @@ DJANGO_SETTINGS_MODULE = recipes.test_settings testpaths = cookbook/tests python_files = tests.py test_*.py *_tests.py # uncomment to run coverage reports -addopts = -n auto --cov=. --cov-report=html:docs/reports/coverage --cov-report=xml:docs/reports/coverage/coverage.xml --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html +addopts = -n @NIX_BUILD_CORES@ --cov=. --cov-report=html:docs/reports/coverage --cov-report=xml:docs/reports/coverage/coverage.xml --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html # addopts = -n auto --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html +-asyncio_default_fixture_loop_scope = fixture \ No newline at end of file ++asyncio_default_fixture_loop_scope = fixture