diff --git a/nib/parse/struct.nix b/nib/parse/struct.nix index 93feae7..5d54ac8 100644 --- a/nib/parse/struct.nix +++ b/nib/parse/struct.nix @@ -1,5 +1,6 @@ {nib, ...}: -with builtins nib.types; rec { +with builtins; +with nib.types; rec { cmpStructErr' = errBadKeys: errBadValues: path: S: T: if isAttrs S && isAttrs T then let diff --git a/nib/sys/default.nix b/nib/sys/default.nix index 36e7e9a..d05d9f7 100644 --- a/nib/sys/default.nix +++ b/nib/sys/default.nix @@ -1,12 +1,13 @@ {nib, ...}: +with builtins; with nib.types; let # === Internal Helper Functions === toSystemName = arch: platform: "${arch}-${platform}"; listsToSystemNames = archs: platforms: crossLists (arch: platform: toSystemName arch platform) [ - (builtins.attrValues archs) - (builtins.attrValues platforms) + (attrValues archs) + (attrValues platforms) ]; in rec { # REF: https://github.com/nix-systems/nix-systems