diff options
author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2023-11-11 20:42:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-11 20:42:10 +0200 |
commit | 0e8902941b7b054f8973fed9024e89f8c3cf4084 (patch) | |
tree | e7dfae25bad700a35f490292ac1904ac55a3ba30 | |
parent | 881d3941c19edced79a15f5c08a9e58881613f18 (diff) | |
parent | 2fa56fcb3024dcdcc680493cb1d92628e214116a (diff) |
Merge pull request #266469 from ambroisie/fix-tandoor-recipes
tandoor-recipes: fix `django-allauth`
-rw-r--r-- | nixos/tests/tandoor-recipes.nix | 25 | ||||
-rw-r--r-- | pkgs/applications/misc/tandoor-recipes/default.nix | 5 |
2 files changed, 5 insertions, 25 deletions
diff --git a/nixos/tests/tandoor-recipes.nix b/nixos/tests/tandoor-recipes.nix index 54456238fe634..f3369da99a055 100644 --- a/nixos/tests/tandoor-recipes.nix +++ b/nixos/tests/tandoor-recipes.nix @@ -3,33 +3,8 @@ import ./make-test-python.nix ({ lib, ... }: { meta.maintainers = with lib.maintainers; [ ambroisie ]; nodes.machine = { pkgs, ... }: { - # Setup using Postgres services.tandoor-recipes = { enable = true; - - extraConfig = { - DB_ENGINE = "django.db.backends.postgresql"; - POSTGRES_HOST = "/run/postgresql"; - POSTGRES_USER = "tandoor_recipes"; - POSTGRES_DB = "tandoor_recipes"; - }; - }; - - services.postgresql = { - enable = true; - ensureDatabases = [ "tandoor_recipes" ]; - ensureUsers = [ - { - name = "tandoor_recipes"; - ensurePermissions."DATABASE tandoor_recipes" = "ALL PRIVILEGES"; - } - ]; - }; - - systemd.services = { - tandoor-recipes = { - after = [ "postgresql.service" ]; - }; }; }; diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index ed07eac44995a..f5ce961e401ac 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -42,6 +42,11 @@ 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/8f66f5c3ca61751a80cc133ff4c59019d6fca406.patch"; + hash = "sha256-oF5YlPg1LEdLvKpxiSqjTmYPbrGquPlRIz6A05031gs="; + }) ]; propagatedBuildInputs = with python.pkgs; [ |