about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-01-24T14·29+0100
committerEelco Dolstra <edolstra@gmail.com>2017-01-24T14·29+0100
commitfa738e50bcd79e5e536d7453f5571e2b13b01bda (patch)
treeaf018e461ef7d3c53816a7b5702e4f21e709d11c
parent4b6d3c5a28d39481d25a134446347c7bfc99f155 (diff)
Revert "builtins.readFile: Put the references of the file, not those needed to realize the file, into the context"
Reverting commit 451c223deea17918454ae083dcfc0ea2b6103cab for now
because it breaks http://hydra.nixos.org/build/46805136, not clear
why.
-rw-r--r--src/libexpr/primops.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 5be61c647496..4398cc951da2 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -779,9 +779,6 @@ static void prim_readFile(EvalState & state, const Pos & pos, Value * * args, Va
     string s = readFile(state.checkSourcePath(path));
     if (s.find((char) 0) != string::npos)
         throw Error(format("the contents of the file ‘%1%’ cannot be represented as a Nix string") % path);
-    context = state.store->isInStore(path) ?
-        state.store->queryPathInfo(state.store->toStorePath(path))->references :
-        PathSet{};
     mkString(v, s.c_str(), context);
 }