wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-30 07:33:16 +02:00
Code Activity

* Strip off the `.nix' suffix from the attribute name for files in

Browse source 
~/.nix-defexpr,  otherwise the attribute cannot be selected with the
  `-A' option.  Useful if you want to stick a Nix expression directly
  in ~/.nix-defexpr.
This commit is contained in:
Eelco Dolstra 2008-08-25 13:31:57 +00:00
parent cc826dc03e
commit b428adc267
5 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/nix-env/nix-env.cc
View file

@ -115,18 +115,29 @@ static void getAllExprs(EvalState & state,
const Path & path, ATermMap & attrs)
{
Strings names = readDirectory(path);
StringSet namesSorted(names.begin(), names.end());
for (Strings::iterator i = names.begin(); i != names.end(); ++i) {
foreach (StringSet::iterator, i, namesSorted) {
Path path2 = path + "/" + *i;
struct stat st;
if (stat(path2.c_str(), &st) == -1)
continue; // ignore dangling symlinks in ~/.nix-defexpr
if (isNixExpr(path2))
attrs.set(toATerm(*i), makeAttrRHS(
if (isNixExpr(path2)) {
/* Strip off the `.nix' filename suffix (if applicable),
otherwise the attribute cannot be selected with the
`-A' option. Useful if you want to stick a Nix
expression directly in ~/.nix-defexpr. */
string attrName = *i;
if (hasSuffix(attrName, ".nix"))
attrName = string(attrName, 0, attrName.size() - 4);
attrs.set(toATerm(attrName), makeAttrRHS(
parseExprFromFile(state, absPath(path2)), makeNoPos()));
}
else
/* `path2' is a directory (with no default.nix in it);
recurse into it. */
getAllExprs(state, path2, attrs);
}
}