Merge pull request 'Qubasa-hsjobeki/bump-nixpkgs' (#4205) from Qubasa-hsjobeki/bump-nixpkgs into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4205

pkgs/clan-cli/clan_cli/tests/fixtures_flakes.py

@@ -5,9 +5,9 @@ import shutil
 import subprocess as sp
 import tempfile
 from collections import defaultdict
-from collections.abc import Callable, Iterator
+from collections.abc import Iterator
 from pathlib import Path
-from typing import Any, NamedTuple
+from typing import NamedTuple
 
 import pytest
 from clan_cli.tests import age_keys
@@ -38,7 +38,12 @@ def def_value() -> defaultdict:
     return defaultdict(def_value)
 
 
-nested_dict: Callable[[], dict[str, Any]] = lambda: defaultdict(def_value)
+def nested_dict() -> defaultdict:
+    """
+    Creates a defaultdict that allows for arbitrary levels of nesting.
+    For example: d['a']['b']['c'] = value
+    """
+    return defaultdict(def_value)
 
 
 # Substitutes strings in a file.

pkgs/clan-cli/clan_cli/tests/helpers/nixos_config.py

@@ -1,11 +0,0 @@
-from collections import defaultdict
-from collections.abc import Callable
-from typing import Any
-
-
-def def_value() -> defaultdict:
-    return defaultdict(def_value)
-
-
-# allows defining nested dictionary in a single line
-nested_dict: Callable[[], dict[str, Any]] = lambda: defaultdict(def_value)

pkgs/clan-cli/clan_cli/vars/check.py

@@ -4,14 +4,13 @@ import logging
 from clan_cli.completions import add_dynamic_completer, complete_machines
 from clan_lib.errors import ClanError
 from clan_lib.machines.machines import Machine
-
-log = logging.getLogger(__name__)
-
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from .generate import Var
 
+log = logging.getLogger(__name__)
+
 
 class VarStatus:
     def __init__(