From fd8cc84777dea78f3a272d98d98ea827bb18bae4 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Mon, 20 Oct 2025 14:05:12 -0600 Subject: [PATCH] tandoor-recipes: 2.2.5 -> 2.3.3 https://github.com/TandoorRecipes/recipes/releases/tag/2.3.3 Diff: https://github.com/TandoorRecipes/recipes/compare/2.2.5...2.3.3 --- pkgs/by-name/ta/tandoor-recipes/common.nix | 4 ++-- pkgs/by-name/ta/tandoor-recipes/package.nix | 6 +++++- pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ta/tandoor-recipes/common.nix b/pkgs/by-name/ta/tandoor-recipes/common.nix index 475f23738cca..721cf51303b6 100644 --- a/pkgs/by-name/ta/tandoor-recipes/common.nix +++ b/pkgs/by-name/ta/tandoor-recipes/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "2.2.5"; + version = "2.3.3"; src = fetchFromGitHub { owner = "TandoorRecipes"; repo = "recipes"; tag = version; - hash = "sha256-N6d5T11fOAtPKAV/tqTWGdwMkWNY8rPpWT2TBSc0ybc="; + hash = "sha256-N9eHoQyNPbjf4XrdNvTuMKs866mO+jgn2zRkXLAMtb8="; }; yarnHash = "sha256-1p79Bdsn6KDApYKz9BAwrA97svbB8ub+Wl49MTIumW8="; diff --git a/pkgs/by-name/ta/tandoor-recipes/package.nix b/pkgs/by-name/ta/tandoor-recipes/package.nix index 5b81e5df48ea..c3a27f4816df 100644 --- a/pkgs/by-name/ta/tandoor-recipes/package.nix +++ b/pkgs/by-name/ta/tandoor-recipes/package.nix @@ -4,7 +4,11 @@ python3, }: let - python = python3; + python = python3.override { + packageOverrides = final: prev: { + django = final.django_5; + }; + }; common = callPackage ./common.nix { }; diff --git a/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch b/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch index 4845110543e8..444b19df821f 100644 --- a/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch +++ b/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch @@ -11,4 +11,4 @@ index 2755dc99..4026b96e 100644 # 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 ++asyncio_default_fixture_loop_scope = function