jaiden/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Shut up warning

Browse source
This commit is contained in:
Eelco Dolstra 2020-01-28 13:16:19 +01:00
parent 1af7b94c1d
commit 6be04476dc
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/nix/installables.cc
View file

@ -434,10 +434,6 @@ std::vector<std::shared_ptr<Installable>> SourceExprCommand::parseInstallables(
}; };
for (auto & s : ss) { for (auto & s : ss) {
size_t hash;
std::optional<StorePath> storePath;
if (hasPrefix(s, "nixpkgs.")) { if (hasPrefix(s, "nixpkgs.")) {
bool static warned; bool static warned;
warnOnce(warned, "the syntax 'nixpkgs.<attr>' is deprecated; use 'nixpkgs:<attr>' instead"); warnOnce(warned, "the syntax 'nixpkgs.<attr>' is deprecated; use 'nixpkgs:<attr>' instead");
@ -454,6 +450,7 @@ std::vector<std::shared_ptr<Installable>> SourceExprCommand::parseInstallables(
fragment == "" ? getDefaultFlakeAttrPaths() : Strings{fragment}, fragment == "" ? getDefaultFlakeAttrPaths() : Strings{fragment},
getDefaultFlakeAttrPathPrefixes())); getDefaultFlakeAttrPathPrefixes()));
} else { } else {
std::optional<StorePath> storePath;
if (s.find('/') != std::string::npos && (storePath = follow(s))) if (s.find('/') != std::string::npos && (storePath = follow(s)))
result.push_back(std::make_shared<InstallableStorePath>(store, store->printStorePath(*storePath))); result.push_back(std::make_shared<InstallableStorePath>(store, store->printStorePath(*storePath)));
else else