From ca94b383718f2dc5f4f14ed6eddd8d04ac9d3fc2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 1 Aug 2012 16:43:36 -0400
Subject: [PATCH] nix-env: Ignore manifest.nix when recursing into
 ~/.nix-defexpr

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.
---
 src/nix-env/nix-env.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
index 475bdd3669..5174daf90d 100644
--- a/src/nix-env/nix-env.cc
+++ b/src/nix-env/nix-env.cc
@@ -112,6 +112,11 @@ static void getAllExprs(EvalState & state,
     StringSet namesSorted(names.begin(), names.end());
 
     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;
         
         struct stat st;