yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use nix flake archive in clan machines update for git+file flake inputs

Browse Source
This commit is contained in:
Jörg Thalheim
2025-01-20 10:39:46 +01:00
parent 889b3479d9
commit 8c667a162a
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/clan-cli/clan_cli/machines/update.py
View File

@@ -2,6 +2,7 @@ import argparse
import json
import logging
import os
import re
import shlex
import sys
@@ -29,11 +30,15 @@ from .inventory import get_all_machines, get_selected_machines
log = logging.getLogger(__name__)
def is_path_input(node: dict[str, dict[str, str]]) -> bool:
def is_local_input(node: dict[str, dict[str, str]]) -> bool:
locked = node.get("locked")
if not locked:
return False
return locked["type"] == "path" or locked.get("url", "").startswith("file://")
# matches path and git+file://
return (
locked["type"] == "path"
or re.match(r"^\w+\+file://", locked.get("url", "")) is not None
)
def upload_sources(machine: Machine) -> str:
@@ -45,7 +50,7 @@ def upload_sources(machine: Machine) -> str:
)
flake_data = nix_metadata(flake_url)
has_path_inputs = any(
is_path_input(node) for node in flake_data["locks"]["nodes"].values()
is_local_input(node) for node in flake_data["locks"]["nodes"].values()
)
if not has_path_inputs: