colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #286168 from ambroisie/update-tandoor-recipes

Browse Source 
tandoor-recipes: 1.5.10 -> 1.5.12
This commit is contained in:
Nick Cao 2024-02-04 09:41:39 -05:00 committed by GitHub
commit 012cc10c88
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/tandoor-recipes/common.nix
View File

@ -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/";

8
pkgs/applications/misc/tandoor-recipes/default.nix
View File

@ -33,11 +33,10 @@ python.pkgs.pythonPackages.buildPythonPackage rec {
patches = [
# Allow setting MEDIA_ROOT through environment variable
./media-root.patch
# https://github.com/TandoorRecipes/recipes/pull/2706
# https://github.com/TandoorRecipes/recipes/pull/2931
(fetchpatch {
url = "https://github.com/TandoorRecipes/recipes/commit/702c1d67d3b2d13cf471bf9daa1d2ef0f1837dec.patch";
hash = "sha256-6vmtYs6b0d38Ojxxc2I7oxqpkIlyRVlhzURBOTO2VlQ=";
url = "https://github.com/TandoorRecipes/recipes/commit/abf981792057481f1d5b7473eb1090b3901ef8fa.patch";
hash = "sha256-3AFf0K/BpVwPQ2NGLUsefj6HvW7ej3szd3WaxFoqMiQ=";
})
];
@ -141,6 +140,7 @@ python.pkgs.pythonPackages.buildPythonPackage rec {
# flaky
disabledTests = [
"test_search_count"
"test_url_import_regex_replace"
];
passthru = {

17
pkgs/applications/misc/tandoor-recipes/media-root.patch
View File

@ -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'