From 9900349b9407800864b2fc57210147556985af33 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sat, 3 Feb 2024 23:12:50 +0100 Subject: [PATCH 1/2] tandoor-recipes: 1.5.10 -> 1.5.12 --- pkgs/applications/misc/tandoor-recipes/common.nix | 6 +++--- pkgs/applications/misc/tandoor-recipes/default.nix | 6 +----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/applications/misc/tandoor-recipes/common.nix index 40882205420a..8461ed816eb9 100644 --- a/pkgs/applications/misc/tandoor-recipes/common.nix +++ b/pkgs/applications/misc/tandoor-recipes/common.nix @@ -1,15 +1,15 @@ { lib, fetchFromGitHub }: rec { - version = "1.5.10"; + version = "1.5.12"; src = fetchFromGitHub { owner = "TandoorRecipes"; repo = "recipes"; rev = version; - hash = "sha256-CkqNPG57e76TT/vF9lscS6m2FbXOvOfqiT/9aM2Il9E="; + hash = "sha256-5UslXRoiq9cipGCOiqpf+rv7OPTsW4qpVTjakNeg4ug="; }; - yarnHash = "sha256-atl2XrY9LmWh2USp6K2W50/khEsnY6OqKBUS26Ln9ZM="; + yarnHash = "sha256-CresovsRh+dLHGnv49fCi/i66QXOS3SnzfFNvkVUfd8="; meta = with lib; { homepage = "https://tandoor.dev/"; diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index cdd143cc766d..63a0857535f8 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -34,11 +34,6 @@ python.pkgs.pythonPackages.buildPythonPackage rec { patches = [ # Allow setting MEDIA_ROOT through environment variable ./media-root.patch - # https://github.com/TandoorRecipes/recipes/pull/2706 - (fetchpatch { - url = "https://github.com/TandoorRecipes/recipes/commit/702c1d67d3b2d13cf471bf9daa1d2ef0f1837dec.patch"; - hash = "sha256-6vmtYs6b0d38Ojxxc2I7oxqpkIlyRVlhzURBOTO2VlQ="; - }) ]; propagatedBuildInputs = with python.pkgs; [ @@ -141,6 +136,7 @@ python.pkgs.pythonPackages.buildPythonPackage rec { # flaky disabledTests = [ "test_search_count" + "test_url_import_regex_replace" ]; passthru = { From c1c639d0e68980981ab9df0ac8a0ce38f0833849 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sat, 3 Feb 2024 23:13:57 +0100 Subject: [PATCH 2/2] tandoor-recipes: use upstream-submitted patch --- .../misc/tandoor-recipes/default.nix | 6 +++++- .../misc/tandoor-recipes/media-root.patch | 17 ----------------- 2 files changed, 5 insertions(+), 18 deletions(-) delete mode 100644 pkgs/applications/misc/tandoor-recipes/media-root.patch diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index 63a0857535f8..98c6f8b530f9 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -33,7 +33,11 @@ python.pkgs.pythonPackages.buildPythonPackage rec { patches = [ # Allow setting MEDIA_ROOT through environment variable - ./media-root.patch + # https://github.com/TandoorRecipes/recipes/pull/2931 + (fetchpatch { + url = "https://github.com/TandoorRecipes/recipes/commit/abf981792057481f1d5b7473eb1090b3901ef8fa.patch"; + hash = "sha256-3AFf0K/BpVwPQ2NGLUsefj6HvW7ej3szd3WaxFoqMiQ="; + }) ]; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/applications/misc/tandoor-recipes/media-root.patch b/pkgs/applications/misc/tandoor-recipes/media-root.patch deleted file mode 100644 index 8114ca8aaeb3..000000000000 --- a/pkgs/applications/misc/tandoor-recipes/media-root.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/recipes/settings.py b/recipes/settings.py -index 5676fe0a..6c6f1747 100644 ---- a/recipes/settings.py -+++ b/recipes/settings.py -@@ -426,10 +426,10 @@ if os.getenv('S3_ACCESS_KEY', ''): - AWS_S3_CUSTOM_DOMAIN = os.getenv('S3_CUSTOM_DOMAIN', '') - - MEDIA_URL = os.getenv('MEDIA_URL', '/media/') -- MEDIA_ROOT = os.path.join(BASE_DIR, "mediafiles") -+ MEDIA_ROOT = os.getenv('MEDIA_ROOT', os.path.join(BASE_DIR, "mediafiles")) - else: - MEDIA_URL = os.getenv('MEDIA_URL', '/media/') -- MEDIA_ROOT = os.path.join(BASE_DIR, "mediafiles") -+ MEDIA_ROOT = os.getenv('MEDIA_ROOT', os.path.join(BASE_DIR, "mediafiles")) - - # Serve static files with gzip - STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'