Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tandoor-recipes: fix django-allauth #266469

Merged
merged 2 commits into from Nov 11, 2023
Merged

tandoor-recipes: fix django-allauth #266469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a3c107
tandoor-recipes: fix django-allauth
ambroisie Nov 9, 2023
2fa56fc
nixos/tests/tandoor-recipes: use SQLite
ambroisie Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 0 additions & 25 deletions nixos/tests/tandoor-recipes.nix
View file
Open in desktop
Expand Up @@ -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" ];
};
};
};

Expand Down
5 changes: 5 additions & 0 deletions pkgs/applications/misc/tandoor-recipes/default.nix
View file
Open in desktop
Expand Up @@ -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; [
Expand Down