diff options
| author | Bruno BELANYI <bruno@belanyi.fr> | 2024-02-03 23:13:57 +0100 |
|---|---|---|
| committer | Bruno BELANYI <bruno@belanyi.fr> | 2024-02-03 23:22:16 +0100 |
| commit | c1c639d0e68980981ab9df0ac8a0ce38f0833849 (patch) | |
| tree | 10a41a232b6438842a9e501cb960d3e2f7492856 /pkgs/applications/misc/tandoor-recipes | |
| parent | 9900349b9407800864b2fc57210147556985af33 (diff) | |
tandoor-recipes: use upstream-submitted patch
Diffstat (limited to 'pkgs/applications/misc/tandoor-recipes')
| -rw-r--r-- | pkgs/applications/misc/tandoor-recipes/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/misc/tandoor-recipes/media-root.patch | 17 |
2 files changed, 5 insertions, 18 deletions
diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index 63a0857535f89..98c6f8b530f99 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 8114ca8aaeb37..0000000000000 --- 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' |