diff --git a/nixos/roles/laminar/test-config.nix b/nixos/roles/laminar/test-config.nix index 0ebe384a..8b793bed 100644 --- a/nixos/roles/laminar/test-config.nix +++ b/nixos/roles/laminar/test-config.nix @@ -89,7 +89,7 @@ in { exitOnError "Cannot pull forward git config." $ exe "/run/wrappers/bin/sudo" "-u" "${user}" "git" "pull" "--ff-only" current_commit <- exitOnError "Current system is from a dirty commit." $ readFileBS "/run/current-system/config-commit" new_system <- readlink "-f" "/var/cache/gc-links/test-config/nixos-configurations/hera" |> captureTrim - new_commit <- readFileBS [i|#{new_system}/config-commit"|] + new_commit <- readFileBS [i|#{new_system}/config-commit|] is_direct_forward <- ("" ==) <$> (git "log" "-n1" "--oneline" ([i|^#{new_commit}|] :: String) (decodeUtf8 current_commit :: String) |> captureTrim) when is_direct_forward do nix_env "-p" "/nix/var/nix/profiles/system" "--set" (decodeUtf8 new_system :: String)