nix flake check --json: Make AAAAAASomeThingsFailToEvaluate show up

Depends on DeterminateSystems/flake-schemas#23.
DeterminateSystems · Jul 1, 2024 · 28a2641 · 28a2641
1 parent e8318bd
commit 28a2641
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/nix/flake-schemas.hh b/src/nix/flake-schemas.hh
@@ -9,6 +9,8 @@ using namespace eval_cache;
 std::tuple<ref<eval_cache::EvalCache>, ref<AttrCursor>>
 call(EvalState & state, std::shared_ptr<flake::LockedFlake> lockedFlake, std::optional<FlakeRef> defaultSchemasFlake);
 
+std::vector<Symbol> toAttrPath(ref<AttrCursor> cursor);
+
 std::string toAttrPathStr(ref<AttrCursor> cursor);
 
 void forEachOutput(

diff --git a/src/nix/flake.cc b/src/nix/flake.cc
@@ -784,7 +784,15 @@ struct CmdFlakeShow : FlakeCommand, MixJSON, flake_schemas::MixFlakeSchemas
  forEachChild([&](Symbol attrName, ref<eval_cache::AttrCursor> node, bool isLast)
  {
  auto j = nlohmann::json::object();
- visit(node, j);
+ try {
+ visit(node, j);
+ } catch (EvalError & e) {
+ // FIXME: make it a flake schema attribute whether to ignore evaluation errors.
+ if (node->root->state.symbols[flake_schemas::toAttrPath(node)[0]] == "legacyPackages")
+ j.emplace("failed", true);
+ else
+ throw;
+ }
  children.emplace(state->symbols[attrName], std::move(j));
  });
  obj.emplace("children", std::move(children));

diff --git a/tests/functional/flakes/show.sh b/tests/functional/flakes/show.sh
@@ -53,11 +53,10 @@ cat >flake.nix <<EOF
 }
 EOF
 nix flake show --json --legacy --all-systems > show-output.json
-jq < show-output.json
 nix eval --impure --expr '
 let show_output = builtins.fromJSON (builtins.readFile ./show-output.json);
 in
-#assert show_output.legacyPackages.output.children.${builtins.currentSystem}.AAAAAASomeThingsFailToEvaluate == { };
+assert show_output.legacyPackages.output.children.${builtins.currentSystem}.children.AAAAAASomeThingsFailToEvaluate.failed;
 assert show_output.legacyPackages.output.children.${builtins.currentSystem}.children.simple.derivationName == "simple";
 true
 '