aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/nix/command.hh23
-rw-r--r--src/nix/installables.cc119
-rw-r--r--src/nix/search.cc4
-rw-r--r--src/nix/why-depends.cc4
4 files changed, 60 insertions, 90 deletions
diff --git a/src/nix/command.hh b/src/nix/command.hh
index ffe64ccb7..83959bf9a 100644
--- a/src/nix/command.hh
+++ b/src/nix/command.hh
@@ -74,23 +74,20 @@ struct Installable
struct SourceExprCommand : virtual Args, StoreCommand, MixEvalArgs
{
std::optional<Path> file;
- std::optional<std::string> flakeUri;
SourceExprCommand();
- /* Return a value representing the Nix expression from which we
- are installing. This is either the file specified by ‘--file’,
- or an attribute set constructed from $NIX_PATH, e.g. ‘{ nixpkgs
- = import ...; bla = import ...; }’. */
- Value * getSourceExpr(EvalState & state);
-
ref<EvalState> getEvalState();
+ std::vector<std::shared_ptr<Installable>> parseInstallables(
+ ref<Store> store, std::vector<std::string> ss);
+
+ std::shared_ptr<Installable> parseInstallable(
+ ref<Store> store, const std::string & installable);
+
private:
std::shared_ptr<EvalState> evalState;
-
- Value * vSourceExpr = 0;
};
enum RealiseMode { Build, NoBuild, DryRun };
@@ -108,8 +105,6 @@ struct InstallablesCommand : virtual Args, SourceExprCommand
void prepare() override;
- virtual bool useDefaultInstallables() { return true; }
-
private:
std::vector<std::string> _installables;
@@ -148,8 +143,6 @@ public:
virtual void run(ref<Store> store, Paths storePaths) = 0;
void run(ref<Store> store) override;
-
- bool useDefaultInstallables() override { return !all; }
};
/* A command that operates on exactly one store path. */
@@ -174,10 +167,6 @@ struct RegisterCommand
}
};
-std::shared_ptr<Installable> parseInstallable(
- SourceExprCommand & cmd, ref<Store> store, const std::string & installable,
- bool useDefaultInstallables);
-
Buildables build(ref<Store> store, RealiseMode mode,
std::vector<std::shared_ptr<Installable>> installables);
diff --git a/src/nix/installables.cc b/src/nix/installables.cc
index 5e4ea6054..bcb22349a 100644
--- a/src/nix/installables.cc
+++ b/src/nix/installables.cc
@@ -19,33 +19,10 @@ SourceExprCommand::SourceExprCommand()
.shortName('f')
.longName("file")
.label("file")
- .description("evaluate FILE rather than use the default installation source")
+ .description("evaluate a set of attributes from FILE (deprecated)")
.dest(&file);
}
-Value * SourceExprCommand::getSourceExpr(EvalState & state)
-{
- if (vSourceExpr) return vSourceExpr;
-
- vSourceExpr = state.allocValue();
-
- if (file)
- state.evalFile(lookupFileArg(state, *file), *vSourceExpr);
- else {
- // FIXME: remove "impure" hack, call some non-user-accessible
- // variant of getFlake instead.
- auto fun = state.parseExprFromString(
- "builtins.mapAttrs (flakeName: flakeInfo:"
- " (getFlake (\"impure:\" + flakeInfo.uri)).${flakeName}.provides.packages or {})", "/");
- auto vFun = state.allocValue();
- state.eval(fun, *vFun);
- auto vRegistry = makeFlakeRegistryValue(state);
- mkApp(*vSourceExpr, *vFun, *vRegistry);
- }
-
- return vSourceExpr;
-}
-
ref<EvalState> SourceExprCommand::getEvalState()
{
if (!evalState)
@@ -140,24 +117,20 @@ struct InstallableExpr : InstallableValue
struct InstallableAttrPath : InstallableValue
{
+ Value * v;
std::string attrPath;
- InstallableAttrPath(SourceExprCommand & cmd, const std::string & attrPath)
- : InstallableValue(cmd), attrPath(attrPath)
+ InstallableAttrPath(SourceExprCommand & cmd, Value * v, const std::string & attrPath)
+ : InstallableValue(cmd), v(v), attrPath(attrPath)
{ }
std::string what() override { return attrPath; }
Value * toValue(EvalState & state) override
{
- auto source = cmd.getSourceExpr(state);
-
- Bindings & autoArgs = *cmd.getAutoArgs(state);
-
- Value * v = findAlongAttrPath(state, attrPath, autoArgs, *source);
- state.forceValue(*v);
-
- return v;
+ auto vRes = findAlongAttrPath(state, attrPath, *cmd.getAutoArgs(state), *v);
+ state.forceValue(*vRes);
+ return vRes;
}
};
@@ -202,60 +175,66 @@ struct InstallableFlake : InstallableValue
std::string attrRegex = R"([A-Za-z_][A-Za-z0-9-_+]*)";
static std::regex attrPathRegex(fmt(R"(%1%(\.%1%)*)", attrRegex));
-static std::vector<std::shared_ptr<Installable>> parseInstallables(
- SourceExprCommand & cmd, ref<Store> store, std::vector<std::string> ss, bool useDefaultInstallables)
+std::vector<std::shared_ptr<Installable>> SourceExprCommand::parseInstallables(
+ ref<Store> store, std::vector<std::string> ss)
{
std::vector<std::shared_ptr<Installable>> result;
- if (ss.empty() && useDefaultInstallables) {
- if (cmd.file == "")
- cmd.file = ".";
- ss = {""};
- }
+ if (file) {
+ // FIXME: backward compatibility hack
+ evalSettings.pureEval = false;
- for (auto & s : ss) {
+ auto state = getEvalState();
+ auto vFile = state->allocValue();
+ state->evalFile(lookupFileArg(*state, *file), *vFile);
- if (s.compare(0, 1, "(") == 0)
- result.push_back(std::make_shared<InstallableExpr>(cmd, s));
+ if (ss.empty())
+ ss = {""};
- /*
- else if (s.find('/') != std::string::npos) {
+ for (auto & s : ss)
+ result.push_back(std::make_shared<InstallableAttrPath>(*this, vFile, s));
- auto path = store->toStorePath(store->followLinksToStore(s));
+ } else {
- if (store->isStorePath(path))
- result.push_back(std::make_shared<InstallableStorePath>(path));
- }
- */
+ for (auto & s : ss) {
+
+ size_t colon;
- else {
- auto colon = s.rfind(':');
- if (colon != std::string::npos) {
+ if (s.compare(0, 1, "(") == 0)
+ result.push_back(std::make_shared<InstallableExpr>(*this, s));
+
+ else if ((colon = s.rfind(':')) != std::string::npos) {
auto flakeRef = std::string(s, 0, colon);
auto attrPath = std::string(s, colon + 1);
- result.push_back(std::make_shared<InstallableFlake>(cmd, FlakeRef(flakeRef), attrPath));
- } else {
- result.push_back(std::make_shared<InstallableFlake>(cmd, FlakeRef("nixpkgs"), s));
+ result.push_back(std::make_shared<InstallableFlake>(*this, FlakeRef(flakeRef), attrPath));
}
- }
- /*
- else if (s == "" || std::regex_match(s, attrPathRegex))
- result.push_back(std::make_shared<InstallableAttrPath>(cmd, s));
+ else if (s.find('/') != std::string::npos) {
+ auto path = store->toStorePath(store->followLinksToStore(s));
+ result.push_back(std::make_shared<InstallableStorePath>(path));
+ }
+
+ else {
+ result.push_back(std::make_shared<InstallableFlake>(*this, FlakeRef("nixpkgs"), s));
+ }
- else
- throw UsageError("don't know what to do with argument '%s'", s);
- */
+ /*
+ else if (s == "" || std::regex_match(s, attrPathRegex))
+ result.push_back(std::make_shared<InstallableAttrPath>(cmd, s));
+
+ else
+ throw UsageError("don't know what to do with argument '%s'", s);
+ */
+ }
}
return result;
}
-std::shared_ptr<Installable> parseInstallable(
- SourceExprCommand & cmd, ref<Store> store, const std::string & installable,
- bool useDefaultInstallables)
+std::shared_ptr<Installable> SourceExprCommand::parseInstallable(
+ ref<Store> store, const std::string & installable)
{
- auto installables = parseInstallables(cmd, store, {installable}, false);
+ auto installables = parseInstallables(store, {installable});
assert(installables.size() == 1);
return installables.front();
}
@@ -342,12 +321,12 @@ PathSet toDerivations(ref<Store> store,
void InstallablesCommand::prepare()
{
- installables = parseInstallables(*this, getStore(), _installables, useDefaultInstallables());
+ installables = parseInstallables(getStore(), _installables);
}
void InstallableCommand::prepare()
{
- installable = parseInstallable(*this, getStore(), _installable, false);
+ installable = parseInstallable(getStore(), _installable);
}
}
diff --git a/src/nix/search.cc b/src/nix/search.cc
index e086de226..55f8d106a 100644
--- a/src/nix/search.cc
+++ b/src/nix/search.cc
@@ -257,7 +257,9 @@ struct CmdSearch : SourceExprCommand, MixJSON
auto cache = writeCache ? std::make_unique<JSONObject>(jsonCacheFile, false) : nullptr;
- doExpr(getSourceExpr(*state), "", true, cache.get());
+ // FIXME
+ throw Error("NOT IMPLEMENTED");
+ //doExpr(getSourceExpr(*state), "", true, cache.get());
} catch (std::exception &) {
/* Fun fact: catching std::ios::failure does not work
diff --git a/src/nix/why-depends.cc b/src/nix/why-depends.cc
index 325a2be0a..32ba5a1ad 100644
--- a/src/nix/why-depends.cc
+++ b/src/nix/why-depends.cc
@@ -74,9 +74,9 @@ struct CmdWhyDepends : SourceExprCommand
void run(ref<Store> store) override
{
- auto package = parseInstallable(*this, store, _package, false);
+ auto package = parseInstallable(store, _package);
auto packagePath = toStorePath(store, Build, package);
- auto dependency = parseInstallable(*this, store, _dependency, false);
+ auto dependency = parseInstallable(store, _dependency);
auto dependencyPath = toStorePath(store, NoBuild, dependency);
auto dependencyPathHash = storePathToHash(dependencyPath);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 15:21:12 +0000