feat(build): #546 expose internals

- Expose internals so the CLI can consume them
fluidattacks · Sep 17, 2021 · 9221aa3 · 9221aa3
1 parent 0f0ae97
commit 9221aa3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/cli/main/__main__.py b/src/cli/main/__main__.py
@@ -370,9 +370,9 @@ def main() -> None:
     except Error as err:
         _log(f"[ERROR] {err.args[0]}")
         if err.args[1:]:
-            _log(f"[ERROR] Stdout: {err.args[1].decode(errors='replace')}")
+            _log(f"[ERROR] Stdout: \n{err.args[1].decode(errors='replace')}")
         if err.args[2:]:
-            _log(f"[ERROR] Stderr: {err.args[2].decode(errors='replace')}")
+            _log(f"[ERROR] Stderr: \n{err.args[2].decode(errors='replace')}")
         sys.exit(1)
     except SystemExit as err:
         sys.exit(err.code)

diff --git a/src/evaluator/from-flake.nix b/src/evaluator/from-flake.nix
@@ -13,7 +13,17 @@ let
     inherit system;
   };
 
-  packages = evaluatorOutputs.config.outputs;
+  packages =
+    (builtins.listToAttrs (builtins.map
+      (output: {
+        name = "makes:config:outputs:${output}";
+        value = evaluatorOutputs.config.outputs.${output};
+      })
+      (builtins.attrNames evaluatorOutputs.config.outputs)))
+    // {
+      "makes:config:attrs" = evaluatorOutputs.config.attrs;
+      "makes:config:cacheAsJson" = evaluatorOutputs.config.cacheAsJson;
+    };
 in
 {
   inherit packages;