restore path-based behavior for non-data-model tests

deployment/check/basic/constants.nix

@@ -3,10 +3,7 @@
     "hello"
     "cowsay"
   ];
-  pathToRoot = builtins.path {
+  pathToRoot = ../../..;
-    path = ../../..;
+  pathFromRoot = ./.;
-    name = "root";
-  };
-  pathFromRoot = "/deployment/check/data-model-ssh";
   useFlake = true;
 }

deployment/check/cli/constants.nix

@@ -5,11 +5,8 @@
     "peertube"
     "pixelfed"
   ];
-  pathToRoot = builtins.path {
+  pathToRoot = ../../..;
-    path = ../../..;
+  pathFromRoot = ./.;
-    name = "root";
-  };
-  pathFromRoot = "/deployment/check/data-model-ssh";
   enableAcme = true;
   useFlake = true;
 }

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 {

deployment/check/data-model-nixops4/constants.nix

@@ -2,11 +2,8 @@
   targetMachines = [
     "nixops4"
   ];
-  pathToRoot = builtins.path {
+  pathToRoot = ../../..;
-    path = ../../..;
+  pathFromRoot = ./.;
-    name = "root";
-  };
-  pathFromRoot = "/deployment/check/data-model-ssh";
   enableAcme = true;
   useFlake = true;
 }

deployment/check/panel/constants.nix

@@ -5,11 +5,8 @@
     "peertube"
     "pixelfed"
   ];
-  pathToRoot = builtins.path {
+  pathToRoot = ../../..;
-    path = ../../..;
+  pathFromRoot = ./.;
-    name = "root";
-  };
-  pathFromRoot = "/deployment/check/data-model-ssh";
   enableAcme = true;
   useFlake = true;
 }