Merge pull request #266469 from ambroisie/fix-tandoor-recipes

tandoor-recipes: fix `django-allauth`

authored by

Peder Bergebakken Sundt and committed by
GitHub
0e890294 881d3941

+5 -25
-25
nixos/tests/tandoor-recipes.nix
··· 3 3 meta.maintainers = with lib.maintainers; [ ambroisie ]; 4 4 5 5 nodes.machine = { pkgs, ... }: { 6 - # Setup using Postgres 7 6 services.tandoor-recipes = { 8 7 enable = true; 9 - 10 - extraConfig = { 11 - DB_ENGINE = "django.db.backends.postgresql"; 12 - POSTGRES_HOST = "/run/postgresql"; 13 - POSTGRES_USER = "tandoor_recipes"; 14 - POSTGRES_DB = "tandoor_recipes"; 15 - }; 16 - }; 17 - 18 - services.postgresql = { 19 - enable = true; 20 - ensureDatabases = [ "tandoor_recipes" ]; 21 - ensureUsers = [ 22 - { 23 - name = "tandoor_recipes"; 24 - ensurePermissions."DATABASE tandoor_recipes" = "ALL PRIVILEGES"; 25 - } 26 - ]; 27 - }; 28 - 29 - systemd.services = { 30 - tandoor-recipes = { 31 - after = [ "postgresql.service" ]; 32 - }; 33 8 }; 34 9 }; 35 10
+5
pkgs/applications/misc/tandoor-recipes/default.nix
··· 42 42 patches = [ 43 43 # Allow setting MEDIA_ROOT through environment variable 44 44 ./media-root.patch 45 + # https://github.com/TandoorRecipes/recipes/pull/2706 46 + (fetchpatch { 47 + url = "https://github.com/TandoorRecipes/recipes/commit/8f66f5c3ca61751a80cc133ff4c59019d6fca406.patch"; 48 + hash = "sha256-oF5YlPg1LEdLvKpxiSqjTmYPbrGquPlRIz6A05031gs="; 49 + }) 45 50 ]; 46 51 47 52 propagatedBuildInputs = with python.pkgs; [