forked from lix-project/lix
3d065192c0
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Change-Id: If18cd5be78da4a70635e3fdcac6326dbfeea71a5
(cherry picked from commit 67eb37c1d0de28160cd25376e51d1ec1b1c8305b)
131 lines
4.3 KiB
C++
131 lines
4.3 KiB
C++
#include "installable-flake.hh"
|
|
#include "command-installable-value.hh"
|
|
#include "common-args.hh"
|
|
#include "shared.hh"
|
|
#include "store-api.hh"
|
|
#include "local-fs-store.hh"
|
|
#include "fs-accessor.hh"
|
|
#include "eval-inline.hh"
|
|
|
|
using namespace nix;
|
|
|
|
struct CmdBundle : InstallableValueCommand
|
|
{
|
|
std::string bundler = "github:NixOS/bundlers";
|
|
std::optional<Path> outLink;
|
|
|
|
CmdBundle()
|
|
{
|
|
addFlag({
|
|
.longName = "bundler",
|
|
.description = fmt("Use a custom bundler instead of the default (`%s`).", bundler),
|
|
.labels = {"flake-url"},
|
|
.handler = {&bundler},
|
|
.completer = {[&](AddCompletions & completions, size_t, std::string_view prefix) {
|
|
completeFlakeRef(completions, getStore(), prefix);
|
|
}}
|
|
});
|
|
|
|
addFlag({
|
|
.longName = "out-link",
|
|
.shortName = 'o',
|
|
.description = "Override the name of the symlink to the build result. It defaults to the base name of the app.",
|
|
.labels = {"path"},
|
|
.handler = {&outLink},
|
|
.completer = completePath
|
|
});
|
|
|
|
}
|
|
|
|
std::string description() override
|
|
{
|
|
return "bundle an application so that it works outside of the Nix store";
|
|
}
|
|
|
|
std::string doc() override
|
|
{
|
|
return
|
|
#include "bundle.md"
|
|
;
|
|
}
|
|
|
|
Category category() override { return catSecondary; }
|
|
|
|
// FIXME: cut&paste from CmdRun.
|
|
Strings getDefaultFlakeAttrPaths() override
|
|
{
|
|
Strings res{
|
|
"apps." + settings.thisSystem.get() + ".default",
|
|
"defaultApp." + settings.thisSystem.get()
|
|
};
|
|
for (auto & s : SourceExprCommand::getDefaultFlakeAttrPaths())
|
|
res.push_back(s);
|
|
return res;
|
|
}
|
|
|
|
Strings getDefaultFlakeAttrPathPrefixes() override
|
|
{
|
|
Strings res{"apps." + settings.thisSystem.get() + "."};
|
|
for (auto & s : SourceExprCommand::getDefaultFlakeAttrPathPrefixes())
|
|
res.push_back(s);
|
|
return res;
|
|
}
|
|
|
|
void run(ref<Store> store, ref<InstallableValue> installable) override
|
|
{
|
|
auto evalState = getEvalState();
|
|
|
|
auto val = installable->toValue(*evalState).first;
|
|
|
|
auto [bundlerFlakeRef, bundlerName, extendedOutputsSpec] = parseFlakeRefWithFragmentAndExtendedOutputsSpec(bundler, absPath("."));
|
|
const flake::LockFlags lockFlags{ .writeLockFile = false };
|
|
InstallableFlake bundler{this,
|
|
evalState, std::move(bundlerFlakeRef), bundlerName, std::move(extendedOutputsSpec),
|
|
{"bundlers." + settings.thisSystem.get() + ".default",
|
|
"defaultBundler." + settings.thisSystem.get()
|
|
},
|
|
{"bundlers." + settings.thisSystem.get() + "."},
|
|
lockFlags
|
|
};
|
|
|
|
auto vRes = evalState->allocValue();
|
|
evalState->callFunction(*bundler.toValue(*evalState).first, *val, *vRes, noPos);
|
|
|
|
if (!evalState->isDerivation(*vRes))
|
|
throw Error("the bundler '%s' does not produce a derivation", bundler.what());
|
|
|
|
auto attr1 = vRes->attrs->get(evalState->sDrvPath);
|
|
if (!attr1)
|
|
throw Error("the bundler '%s' does not produce a derivation", bundler.what());
|
|
|
|
NixStringContext context2;
|
|
auto drvPath = evalState->coerceToStorePath(attr1->pos, *attr1->value, context2, "");
|
|
|
|
auto attr2 = vRes->attrs->get(evalState->sOutPath);
|
|
if (!attr2)
|
|
throw Error("the bundler '%s' does not produce a derivation", bundler.what());
|
|
|
|
auto outPath = evalState->coerceToStorePath(attr2->pos, *attr2->value, context2, "");
|
|
|
|
store->buildPaths({
|
|
DerivedPath::Built {
|
|
.drvPath = makeConstantStorePathRef(drvPath),
|
|
.outputs = OutputsSpec::All { },
|
|
},
|
|
});
|
|
|
|
auto outPathS = store->printStorePath(outPath);
|
|
|
|
if (!outLink) {
|
|
auto * attr = vRes->attrs->get(evalState->sName);
|
|
if (!attr)
|
|
throw Error("attribute 'name' missing");
|
|
outLink = evalState->forceStringNoCtx(*attr->value, attr->pos, "");
|
|
}
|
|
|
|
// TODO: will crash if not a localFSStore?
|
|
store.dynamic_pointer_cast<LocalFSStore>()->addPermRoot(outPath, absPath(*outLink));
|
|
}
|
|
};
|
|
|
|
static auto r2 = registerCommand<CmdBundle>("bundle");
|