From 6e873c33d0aacbf1188f5c65608f90a30a888993 Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra <kiara@procolix.eu>
Date: Mon, 1 Sep 2025 14:46:53 +0200
Subject: [PATCH] restore path-based behavior for non-data-model tests

---
 deployment/check/basic/constants.nix              | 7 ++-----
 deployment/check/cli/constants.nix                | 7 ++-----
 deployment/check/common/sharedOptions.nix         | 3 ++-
 deployment/check/data-model-nixops4/constants.nix | 7 ++-----
 deployment/check/panel/constants.nix              | 7 ++-----
 5 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/deployment/check/basic/constants.nix b/deployment/check/basic/constants.nix
index 18b163b8..f2573fb8 100644
--- a/deployment/check/basic/constants.nix
+++ b/deployment/check/basic/constants.nix
@@ -3,10 +3,7 @@
     "hello"
     "cowsay"
   ];
-  pathToRoot = builtins.path {
-    path = ../../..;
-    name = "root";
-  };
-  pathFromRoot = "/deployment/check/data-model-ssh";
+  pathToRoot = ../../..;
+  pathFromRoot = ./.;
   useFlake = true;
 }
diff --git a/deployment/check/cli/constants.nix b/deployment/check/cli/constants.nix
index 84885019..a48d9076 100644
--- a/deployment/check/cli/constants.nix
+++ b/deployment/check/cli/constants.nix
@@ -5,11 +5,8 @@
     "peertube"
     "pixelfed"
   ];
-  pathToRoot = builtins.path {
-    path = ../../..;
-    name = "root";
-  };
-  pathFromRoot = "/deployment/check/data-model-ssh";
+  pathToRoot = ../../..;
+  pathFromRoot = ./.;
   enableAcme = true;
   useFlake = true;
 }
diff --git a/deployment/check/common/sharedOptions.nix b/deployment/check/common/sharedOptions.nix
index 95736066..a7e4e41f 100644
--- a/deployment/check/common/sharedOptions.nix
+++ b/deployment/check/common/sharedOptions.nix
@@ -32,10 +32,11 @@ in
     };
 
     pathFromRoot = mkOption {
-      type = types.str;
+      type = types.either types.path types.str;
       description = ''
         Path from the root of the repository to the working directory.
       '';
+      apply = x: if lib.isString x then x else lib.path.removePrefix config.pathToRoot x;
     };
 
     pathToCwd = mkOption {
diff --git a/deployment/check/data-model-nixops4/constants.nix b/deployment/check/data-model-nixops4/constants.nix
index 34a3058a..548d6605 100644
--- a/deployment/check/data-model-nixops4/constants.nix
+++ b/deployment/check/data-model-nixops4/constants.nix
@@ -2,11 +2,8 @@
   targetMachines = [
     "nixops4"
   ];
-  pathToRoot = builtins.path {
-    path = ../../..;
-    name = "root";
-  };
-  pathFromRoot = "/deployment/check/data-model-ssh";
+  pathToRoot = ../../..;
+  pathFromRoot = ./.;
   enableAcme = true;
   useFlake = true;
 }
diff --git a/deployment/check/panel/constants.nix b/deployment/check/panel/constants.nix
index 84885019..a48d9076 100644
--- a/deployment/check/panel/constants.nix
+++ b/deployment/check/panel/constants.nix
@@ -5,11 +5,8 @@
     "peertube"
     "pixelfed"
   ];
-  pathToRoot = builtins.path {
-    path = ../../..;
-    name = "root";
-  };
-  pathFromRoot = "/deployment/check/data-model-ssh";
+  pathToRoot = ../../..;
+  pathFromRoot = ./.;
   enableAcme = true;
   useFlake = true;
 }