maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix build: Use Nix search path

Browse source 
That is, unless --file is specified, the Nix search path is
synthesized into an attribute set. Thus you can say

  $ nix build nixpkgs.hello

assuming $NIX_PATH contains an entry of the form "nixpkgs=...". This
is more verbose than

  $ nix build hello

but is less ambiguous.
This commit is contained in:
Eelco Dolstra 2016-08-23 17:11:19 +02:00
parent 22d6e31fc6
commit d74236d1f2
5 changed files with 57 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/nix/installables.cc
View file

@ -9,6 +9,41 @@
namespace nix {
Value * MixInstallables::buildSourceExpr(EvalState & state)
{
Value * vRoot = state.allocValue();
if (file != "") {
Expr * e = state.parseExprFromFile(resolveExprPath(lookupFileArg(state, file)));
state.eval(e, *vRoot);
}
else {
/* Construct the installation source from $NIX_PATH. */
auto searchPath = state.getSearchPath();
state.mkAttrs(*vRoot, searchPath.size());
std::unordered_set<std::string> seen;
for (auto & i : searchPath) {
if (i.first == "") continue;
if (seen.count(i.first)) continue;
seen.insert(i.first);
if (!pathExists(i.second)) continue;
mkApp(*state.allocAttr(*vRoot, state.symbols.create(i.first)),
state.getBuiltin("import"),
mkString(*state.allocValue(), i.second));
}
vRoot->attrs->sort();
}
return vRoot;
}
UserEnvElems MixInstallables::evalInstallables(ref<Store> store)
{
UserEnvElems res;
@ -46,15 +81,12 @@ UserEnvElems MixInstallables::evalInstallables(ref<Store> store)
EvalState state({}, store);
Expr * e = state.parseExprFromFile(resolveExprPath(lookupFileArg(state, file)));
Value vRoot;
state.eval(e, vRoot);
auto vRoot = buildSourceExpr(state);
std::map<string, string> autoArgs_;
Bindings & autoArgs(*evalAutoArgs(state, autoArgs_));
Value & v(*findAlongAttrPath(state, installable, autoArgs, vRoot));
Value & v(*findAlongAttrPath(state, installable, autoArgs, *vRoot));
state.forceValue(v);
DrvInfos drvs;

12
src/nix/installables.hh
View file

@ -21,10 +21,13 @@ struct UserEnvElem
typedef std::vector<UserEnvElem> UserEnvElems;
struct Value;
class EvalState;
struct MixInstallables : virtual Args
{
Strings installables;
Path file = "<nixpkgs>";
Path file;
MixInstallables()
{
@ -33,6 +36,13 @@ struct MixInstallables : virtual Args
}
UserEnvElems evalInstallables(ref<Store> store);
/* 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 * buildSourceExpr(EvalState & state);
};
}