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

nix-env: Ignore manifest.nix when recursing into ~/.nix-defexpr

Browse source 
Channels are implemented using a profile now, and profiles contain a
manifest.nix file.  This should be ignored to prevent bogus packages
from showing up in nix-env.
This commit is contained in:
Eelco Dolstra 2012-08-01 16:43:36 -04:00
parent 46f852cda0
commit ca94b38371
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -112,6 +112,11 @@ static void getAllExprs(EvalState & state,
StringSet namesSorted(names.begin(), names.end()); StringSet namesSorted(names.begin(), names.end());
foreach (StringSet::iterator, i, namesSorted) { foreach (StringSet::iterator, i, namesSorted) {
/* Ignore the manifest.nix used by profiles. This is
necessary to prevent it from showing up in channels (which
are implemented using profiles). */
if (*i == "manifest.nix") continue;
Path path2 = path + "/" + *i; Path path2 = path + "/" + *i;
struct stat st; struct stat st;