lix-project/lix
20
58
Fork 31
Code Issues 360 Code Review (Gerrit) Projects 3 Releases Wiki Activity

feat: read installable paths from stdin

Browse source 
Resolves #7437 for new `nix` commands only by adding a `--stdin` flag.

If paths are also passed on the cli they will be combined with the ones
from standard input.
This commit is contained in:
Timothy DeHerrera 2023-01-12 12:35:22 -07:00
parent db14e1d4ae
commit 269caa5317
No known key found for this signature in database
GPG key ID: E44213186BC9AFE2
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libcmd/command.hh
View file

@ -128,6 +128,8 @@ struct InstallablesCommand : virtual Args, SourceExprCommand
virtual bool useDefaultInstallables() { return true; }
bool readFromStdIn;
std::vector<std::string> getFlakesForCompletion() override;
protected:

17
src/libcmd/installables.cc
View file

@ -691,6 +691,13 @@ StorePathSet Installable::toDerivations(
InstallablesCommand::InstallablesCommand()
{
addFlag({
.longName = "stdin",
.description = "Read installables from the standard input.",
.handler = {&readFromStdIn, true}
});
expectArgs({
.label = "installables",
.handler = {&_installables},
@ -707,10 +714,18 @@ void InstallablesCommand::prepare()
Installables InstallablesCommand::load()
{
if (_installables.empty() && useDefaultInstallables())
if (_installables.empty() && useDefaultInstallables() && !readFromStdIn)
// FIXME: commands like "nix profile install" should not have a
// default, probably.
_installables.push_back(".");
if (readFromStdIn && !isatty(STDIN_FILENO)) {
std::string word;
while (std::cin >> word) {
_installables.emplace_back(std::move(word));
}
}
return parseInstallables(getStore(), _installables);
}