Merge remote-tracking branch 'origin/master' into staging-next

2025-08-18 15:14:49 +03:00
parent 6b1c5252fd 767807cd18
commit 8eb75c9e73
74 changed files with 3185 additions and 1655 deletions
--- a/nixos/lib/utils.nix
+++ b/nixos/lib/utils.nix
@@ -219,14 +219,14 @@ let
              let
                escapedName = ''"${replaceStrings [ ''"'' "\\" ] [ ''\"'' "\\\\" ] name}"'';
              in
-              recurse (prefix + "." + escapedName) item.${name}
+              recurse (prefix + (if prefix == "." then "" else ".") + escapedName) item.${name}
            ) (attrNames item)
          else if isList item then
            imap0 (index: item: recurse (prefix + "[${toString index}]") item) item
          else
            [ ];
      in
-      listToAttrs (flatten (recurse "" item));
+      listToAttrs (flatten (recurse "." item));

    /*
      Takes an attrset and a file path and generates a bash snippet that