From e12f0c9ead4adf73c28eea701a5de5b502f4a4e9 Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Sun, 31 Aug 2025 11:05:23 +0200 Subject: [PATCH] stablize `pathToRoot` by `builtins.path` --- deployment/check/basic/constants.nix | 7 +++++-- deployment/check/cli/constants.nix | 7 +++++-- deployment/check/data-model-nixops4/constants.nix | 7 +++++-- deployment/check/panel/constants.nix | 7 +++++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/deployment/check/basic/constants.nix b/deployment/check/basic/constants.nix index f2573fb8..18b163b8 100644 --- a/deployment/check/basic/constants.nix +++ b/deployment/check/basic/constants.nix @@ -3,7 +3,10 @@ "hello" "cowsay" ]; - pathToRoot = ../../..; - pathFromRoot = ./.; + pathToRoot = builtins.path { + path = ../../..; + name = "root"; + }; + pathFromRoot = "/deployment/check/data-model-ssh"; useFlake = true; } diff --git a/deployment/check/cli/constants.nix b/deployment/check/cli/constants.nix index a48d9076..84885019 100644 --- a/deployment/check/cli/constants.nix +++ b/deployment/check/cli/constants.nix @@ -5,8 +5,11 @@ "peertube" "pixelfed" ]; - pathToRoot = ../../..; - pathFromRoot = ./.; + pathToRoot = builtins.path { + path = ../../..; + name = "root"; + }; + pathFromRoot = "/deployment/check/data-model-ssh"; enableAcme = true; useFlake = true; } diff --git a/deployment/check/data-model-nixops4/constants.nix b/deployment/check/data-model-nixops4/constants.nix index 548d6605..34a3058a 100644 --- a/deployment/check/data-model-nixops4/constants.nix +++ b/deployment/check/data-model-nixops4/constants.nix @@ -2,8 +2,11 @@ targetMachines = [ "nixops4" ]; - pathToRoot = ../../..; - pathFromRoot = ./.; + pathToRoot = builtins.path { + path = ../../..; + name = "root"; + }; + pathFromRoot = "/deployment/check/data-model-ssh"; enableAcme = true; useFlake = true; } diff --git a/deployment/check/panel/constants.nix b/deployment/check/panel/constants.nix index a48d9076..84885019 100644 --- a/deployment/check/panel/constants.nix +++ b/deployment/check/panel/constants.nix @@ -5,8 +5,11 @@ "peertube" "pixelfed" ]; - pathToRoot = ../../..; - pathFromRoot = ./.; + pathToRoot = builtins.path { + path = ../../..; + name = "root"; + }; + pathFromRoot = "/deployment/check/data-model-ssh"; enableAcme = true; useFlake = true; }