From 0818fcf64b2d58c8f74ea29ac7f0a8aa74487c0f Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Tue, 30 Dec 2025 22:21:46 +0200
Subject: [PATCH] nixos/test/nominatim: replace activation script by
 ExecStartPre

See https://github.com/NixOS/nixpkgs/issues/475305
---
 nixos/tests/nominatim.nix | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/nixos/tests/nominatim.nix b/nixos/tests/nominatim.nix
index 78106b61d778..4294d04fe880 100644
--- a/nixos/tests/nominatim.nix
+++ b/nixos/tests/nominatim.nix
@@ -59,14 +59,34 @@ in
       { config, pkgs, ... }:
       {
         # Database password
-        system.activationScripts = {
-          passwordFile.text = with config.services.nominatim.database; ''
-            mkdir -p /run/secrets
-            echo "${host}:${toString port}:${dbname}:${apiUser}:password" \
-              > /run/secrets/pgpass
-            chown nominatim-api:nominatim-api /run/secrets/pgpass
-            chmod 0600 /run/secrets/pgpass
-          '';
+        systemd.services.nominatim = {
+          serviceConfig.ExecStartPre =
+            let
+              createPasswordFile = lib.getExe (
+                pkgs.writeShellApplication {
+                  name = "nominatim-pre-start";
+                  text =
+                    let
+                      inherit (config.services.nominatim.database)
+                        host
+                        port
+                        dbname
+                        apiUser
+                        ;
+                    in
+                    ''
+                      mkdir -p /run/secrets
+                      echo "${host}:${toString port}:${dbname}:${apiUser}:password" \
+                        > /run/secrets/pgpass
+                      chown nominatim-api:nominatim-api /run/secrets/pgpass
+                      chmod 0600 /run/secrets/pgpass
+                    '';
+                }
+              );
+            in
+            [
+              "+${createPasswordFile}"
+            ];
         };
 
         # Nominatim