Unverified Commit 0e890294 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

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

tandoor-recipes: fix `django-allauth`
parents 881d3941 2fa56fcb

nixos/tests/tandoor-recipes.nix

+0 −25
Original line number Diff line number Diff line
@@ -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" ];

      };

    };

  };

pkgs/applications/misc/tandoor-recipes/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -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; [