diff --git a/pkgs/clan-cli/clan_lib/dirs/__init__.py b/pkgs/clan-cli/clan_lib/dirs/__init__.py index 53ee4b990..994af7a9a 100644 --- a/pkgs/clan-cli/clan_lib/dirs/__init__.py +++ b/pkgs/clan-cli/clan_lib/dirs/__init__.py @@ -32,8 +32,6 @@ def get_clan_flake_toplevel() -> Path | None: return find_toplevel([".clan-flake", ".git", ".hg", ".svn", "flake.nix"]) -def find_git_repo_root() -> Path | None: - return find_toplevel([".git"]) def clan_key_safe(flake_url: str) -> str: diff --git a/pkgs/generate-test-vars/generate_test_vars/cli.py b/pkgs/generate-test-vars/generate_test_vars/cli.py index e0b83e1ef..d42df49e4 100755 --- a/pkgs/generate-test-vars/generate_test_vars/cli.py +++ b/pkgs/generate-test-vars/generate_test_vars/cli.py @@ -12,7 +12,7 @@ from tempfile import NamedTemporaryFile from typing import Any, override from clan_cli.vars.generate import generate_vars -from clan_lib.dirs import find_git_repo_root +from clan_lib.dirs import find_toplevel from clan_lib.flake.flake import Flake from clan_lib.machines.machines import Machine from clan_lib.nix import nix_config, nix_eval, nix_test_store @@ -139,7 +139,7 @@ def parse_args() -> Options: i.e. 'nix eval #checks ...' """, required=False, - default=os.environ.get("PRJ_ROOT", find_git_repo_root()), + default=os.environ.get("PRJ_ROOT", find_toplevel([".git"])), ) parser.add_argument( "--clean",