From 1884ac1d43929040d4e68f0f173f58ffdadc1781 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Fri, 13 Mar 2026 10:58:31 +0100
Subject: [PATCH] update downstream module file

---
 froide-govplan.nix | 96 +++++++++++++++++++++++-----------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/froide-govplan.nix b/froide-govplan.nix
index 6e4f236..a77d60e 100644
--- a/froide-govplan.nix
+++ b/froide-govplan.nix
@@ -13,15 +13,13 @@ let
   pkg = cfg.package.overridePythonAttrs (old: {
     src = ./.;
     dependencies = old.dependencies ++ [ cfg.package.python.pkgs.mastodon-py ];
-    postInstall =
-      old.postInstall
-      + ''
-        ln -s ${settingsFile} $out/${pkg.python.sitePackages}/froide_govplan/project/extra_settings.py
+    postInstall = old.postInstall + ''
+      ln -s ${settingsFile} $out/${pkg.python.sitePackages}/froide_govplan/project/extra_settings.py
 
-        rm -r $out/${pkgs.python3.sitePackages}/froide_govplan/templates
-        ln -sf /var/lib/froide-govplan/templates $out/${pkgs.python3.sitePackages}/froide_govplan/templates
-        cp -r froide_govplan/static $out/${pkgs.python3.sitePackages}/froide_govplan/
-      '';
+      rm -r $out/${pkgs.python3.sitePackages}/froide_govplan/templates
+      ln -sf /var/lib/froide-govplan/templates $out/${pkgs.python3.sitePackages}/froide_govplan/templates
+      cp -r froide_govplan/static $out/${pkgs.python3.sitePackages}/froide_govplan/
+    '';
   });
 
   froide-govplan = pkgs.writeShellApplication {
@@ -169,9 +167,9 @@ in
     systemd = {
       services = {
 
-        postgresql.serviceConfig.ExecStartPost =
+        postgresql-setup.serviceConfig.ExecStartPost =
           let
-            sqlFile = pkgs.writeText "immich-pgvectors-setup.sql" ''
+            sqlFile = pkgs.writeText "froide-govplan-postgis-setup.sql" ''
               CREATE EXTENSION IF NOT EXISTS postgis;
             '';
           in
@@ -190,49 +188,51 @@ in
             Group = "govplan";
           };
           after = [
-            "postgresql.service"
+            "postgresql.target"
             "network.target"
             "systemd-tmpfiles-setup.service"
           ];
           wantedBy = [ "multi-user.target" ];
-          environment =
-            {
-              PYTHONPATH = pkg.python.pkgs.makePythonPath (with pkg.python.pkgs; [
+          environment = {
+            PYTHONPATH = pkg.python.pkgs.makePythonPath (
+              with pkg.python.pkgs;
+              [
 
-    bleach
-    django-admin-sortable2
-    django-cms
-    django-filer
-    django-mfa3
-    django-mptt
-    django-oauth-toolkit
-    django-sekizai
-    django-tinymce
-    django-treebeard
-    djangocms-alias
-    # Downgrade to last working version
-    (toPythonModule (
-      pkgs.froide.overridePythonAttrs (prev: {
-        nativeBuildInputs = [ pkgs.makeBinaryWrapper ];
-        postBuild = "";
-        doCheck = false;
-        pnpmDeps = null;
-        src = prev.src.override {
-          rev = "a78a4054f9f37b0a5109a6d8cfbbda742f86a8ca";
-          hash = "sha256-gtOssbsVf3nG+pmLPgvh4685vHh2x+jlXiTjU+JhQa8=";
-        };
-      })
-    ))
-    psycopg
-	      mastodon-py
-	      (toPythonModule (pkg))
-	      ]);
-              GDAL_LIBRARY_PATH = "${pkgs.gdal}/lib/libgdal.so";
-              GEOS_LIBRARY_PATH = "${pkgs.geos}/lib/libgeos_c.so";
-            }
-            // lib.optionalAttrs (cfg.secretKeyFile != null) {
-              SECRET_KEY_FILE = cfg.secretKeyFile;
-            };
+                bleach
+                django-admin-sortable2
+                django-cms
+                django-filer
+                django-mfa3
+                django-mptt
+                django-oauth-toolkit
+                django-sekizai
+                django-tinymce
+                django-treebeard
+                djangocms-alias
+                # Downgrade to last working version
+                (toPythonModule (
+                  pkgs.froide.overridePythonAttrs (prev: {
+                    nativeBuildInputs = [ pkgs.makeBinaryWrapper ];
+                    postBuild = "";
+                    doCheck = false;
+                    pnpmDeps = null;
+                    src = prev.src.override {
+                      rev = "a78a4054f9f37b0a5109a6d8cfbbda742f86a8ca";
+                      hash = "sha256-gtOssbsVf3nG+pmLPgvh4685vHh2x+jlXiTjU+JhQa8=";
+                    };
+                  })
+                ))
+                psycopg
+                mastodon-py
+                (toPythonModule (pkg))
+              ]
+            );
+            GDAL_LIBRARY_PATH = "${pkgs.gdal}/lib/libgdal.so";
+            GEOS_LIBRARY_PATH = "${pkgs.geos}/lib/libgeos_c.so";
+          }
+          // lib.optionalAttrs (cfg.secretKeyFile != null) {
+            SECRET_KEY_FILE = cfg.secretKeyFile;
+          };
           preStart = ''
             # Auto-migrate on first run or if the package has changed
             versionFile="${cfg.dataDir}/src-version"