Skip to content

Ensure that we still create map kv pairs for floating CA outputs #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 14, 2024
Merged

Ensure that we still create map kv pairs for floating CA outputs #336

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ca753d
Simplify JSON output of `Drv`
Ericson2314 Nov 14, 2024
d934a3a
Deduplicate `Drv::Drv`
Ericson2314 Nov 14, 2024
67671fe
Ensure that we still create map kv pairs for floating CA outputs
Ericson2314 Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 10 additions & 20 deletions src/drv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,12 @@ Drv::Drv(std::string &attrPath, nix::EvalState &state,
auto localStore = state.store.dynamic_pointer_cast<nix::LocalFSStore>();

try {
nix::PackageInfo::Outputs outputsQueried;

// CA derivations do not have static output paths, so we have to
// fallback if we encounter an error
try {
for (auto &[outputName, optOutputPath] :
packageInfo.queryOutputs(true)) {
if (!optOutputPath) {
continue;
}
outputs[outputName] =
localStore->printStorePath(*optOutputPath);
}
outputsQueried = packageInfo.queryOutputs(true);
} catch (const nix::UnimplementedError &e) {
if (!nix::experimentalFeatureSettings.isEnabled(
nix::Xp::CaDerivations)) {
Expand All @@ -92,13 +87,14 @@ Drv::Drv(std::string &attrPath, nix::EvalState &state,
}
// we are probably hitting this:
// https://github.com/NixOS/nix/blob/39da9462e9c677026a805c5ee7ba6bb306f49c59/src/libexpr/get-drvs.cc#L106
for (auto &[outputName, optOutputPath] :
packageInfo.queryOutputs(false)) {
if (!optOutputPath) {
continue;
}
outputsQueried = packageInfo.queryOutputs(false);
}
for (auto &[outputName, optOutputPath] : outputsQueried) {
if (optOutputPath) {
outputs[outputName] =
localStore->printStorePath(*optOutputPath);
} else {
outputs[outputName] = std::nullopt;
}
}
} catch (const std::exception &e) {
Expand Down Expand Up @@ -150,16 +146,10 @@ Drv::Drv(std::string &attrPath, nix::EvalState &state,
}

void to_json(nlohmann::json &json, const Drv &drv) {
std::map<std::string, nlohmann::json> outputsJson;
for (const auto &[name, optPath] : drv.outputs) {
outputsJson[name] =
optPath ? nlohmann::json(*optPath) : nlohmann::json(nullptr);
}

json = nlohmann::json{{"name", drv.name},
{"system", drv.system},
{"drvPath", drv.drvPath},
{"outputs", outputsJson},
{"outputs", drv.outputs},
{"inputDrvs", drv.inputDrvs}};

if (drv.meta.has_value()) {
Expand Down
Loading