Merge remote-tracking branch 'origin/master' into lazy-trees

src/libcmd/common-eval-args.cc

@@ -8,7 +8,6 @@
 #include "flake/flakeref.hh"
 #include "store-api.hh"
 #include "command.hh"
-#include "fs-input-accessor.hh"
 #include "tarball.hh"
 #include "fetch-to-store.hh"
 

src/libexpr/eval.cc

@@ -2038,7 +2038,7 @@ void ExprConcatStrings::eval(EvalState & state, Env & env, Value & v)
  // List of returned strings. References to these Values must NOT be persisted.
  SmallTemporaryValueVector<conservativeStackReservation> values(es->size());
  Value * vTmpP = values.data();
- std::shared_ptr<InputAccessor> accessor;
+ std::shared_ptr<SourceAccessor> accessor;
 
  for (auto & [i_pos, i] : *es) {
  Value * vTmp = vTmpP++;
@@ -2533,8 +2533,8 @@ std::pair<SingleDerivedPath, std::string_view> EvalState::coerceToSingleDerivedP
  return std::move(b);
  },
  [&](NixStringContextElem::InputAccessor && a) -> SingleDerivedPath {
- auto accessor = inputAccessors.find(a.accessor);
- assert(accessor != inputAccessors.end());
+ auto accessor = sourceAccessors.find(a.accessor);
+ assert(accessor != sourceAccessors.end());
  return SingleDerivedPath::Opaque(fetchToStore(
  *store,
  {accessor->second},

src/libexpr/eval.hh

@@ -248,9 +248,9 @@ public:
 
  const SourcePath callFlakeInternal;
 
- /* A map keyed by InputAccessor::number that keeps input accessors
+ /* A map keyed by SourceAccessor::number that keeps input accessors
  alive. */
- std::unordered_map<size_t, ref<InputAccessor>> inputAccessors;
+ std::unordered_map<size_t, ref<SourceAccessor>> sourceAccessors;
 
  /**
  * Store used to materialise .drv files.
@@ -359,7 +359,7 @@ public:
  */
  SourcePath rootPath(CanonPath path);
 
- void registerAccessor(ref<InputAccessor> accessor);
+ void registerAccessor(ref<SourceAccessor> accessor);
 
  /* Convert a path to a string representation of the format
  `/nix/store/virtual000...<accessor-number>/<path>`. */

src/libexpr/flake/flake.cc

@@ -296,7 +296,7 @@ static Flake getFlake(
  auto [accessor, lockedRef] = resolvedRef.lazyFetch(state.store);
 
  if (!patches.empty())
- accessor = makePatchingInputAccessor(accessor, patches);
+ accessor = makePatchingSourceAccessor(accessor, patches);
 
  state.registerAccessor(accessor);
 

src/libexpr/flake/flakeref.cc

@@ -289,7 +289,7 @@ FlakeRef FlakeRef::fromAttrs(const fetchers::Attrs & attrs)
  fetchers::maybeGetStrAttr(attrs, "dir").value_or(""));
 }
 
-std::pair<ref<InputAccessor>, FlakeRef> FlakeRef::lazyFetch(ref<Store> store) const
+std::pair<ref<SourceAccessor>, FlakeRef> FlakeRef::lazyFetch(ref<Store> store) const
 {
  auto [accessor, lockedInput] = input.getAccessor(store);
  return {accessor, FlakeRef(std::move(lockedInput), subdir)};

src/libexpr/flake/flakeref.hh

@@ -63,7 +63,7 @@ struct FlakeRef
 
  static FlakeRef fromAttrs(const fetchers::Attrs & attrs);
 
- std::pair<ref<InputAccessor>, FlakeRef> lazyFetch(ref<Store> store) const;
+ std::pair<ref<SourceAccessor>, FlakeRef> lazyFetch(ref<Store> store) const;
 };
 
 std::ostream & operator << (std::ostream & str, const FlakeRef & flakeRef);

src/libexpr/paths.cc

@@ -14,9 +14,9 @@ SourcePath EvalState::rootPath(PathView path)
  return {rootFS, CanonPath(absPath(path))};
 }
 
-void EvalState::registerAccessor(ref<InputAccessor> accessor)
+void EvalState::registerAccessor(ref<SourceAccessor> accessor)
 {
- inputAccessors.emplace(accessor->number, accessor);
+ sourceAccessors.emplace(accessor->number, accessor);
 }
 
 std::string EvalState::encodePath(const SourcePath & path)
@@ -26,7 +26,7 @@ std::string EvalState::encodePath(const SourcePath & path)
  to /nix/store/virtual000...<N>) and we should deprecate it
  eventually. So print a warning about use of an encoded path in
  decodePath(). */
- return path.accessor == ref<InputAccessor>(rootFS)
+ return path.accessor == ref<SourceAccessor>(rootFS)
  ? path.path.abs()
  : fmt("%s%08d-source%s", virtualPathMarker, path.accessor->number, path.path.absOrEmpty());
 }
@@ -46,8 +46,8 @@ SourcePath EvalState::decodePath(std::string_view s, PosIdx pos)
  size_t number = std::stoi(std::string(s.substr(0, slash)), nullptr, 10);
  s = slash == s.npos ? "" : s.substr(slash);
 
- auto accessor = inputAccessors.find(number);
- if (accessor == inputAccessors.end())
+ auto accessor = sourceAccessors.find(number);
+ if (accessor == sourceAccessors.end())
  fail();
 
  SourcePath path{accessor->second, CanonPath(s)};
@@ -116,8 +116,8 @@ std::string EvalState::rewriteVirtualPaths(std::string_view s, PosIdx pos)
  try {
  size_t number = std::stoi(std::string(s.substr(m + 24, 8)), nullptr, 10); // FIXME
 
- auto accessor = inputAccessors.find(number);
- assert(accessor != inputAccessors.end()); // FIXME
+ auto accessor = sourceAccessors.find(number);
+ assert(accessor != sourceAccessors.end()); // FIXME
 
  warn(
  "derivation at %s has an attribute that refers to source tree '%s' without context; this does not work correctly",

src/libexpr/primops.cc

@@ -1329,8 +1329,8 @@ static void derivationStrictInternal(
  [&](const NixStringContextElem::InputAccessor & a) {
  /* Copy a virtual path (from encodePath()) to the
  store. */
- auto accessor = state.inputAccessors.find(a.accessor);
- assert(accessor != state.inputAccessors.end());
+ auto accessor = state.sourceAccessors.find(a.accessor);
+ assert(accessor != state.sourceAccessors.end());
  SourcePath path{accessor->second};
  auto storePath = fetchToStore(
  *state.store,

src/libexpr/primops/patch.cc

@@ -3,40 +3,38 @@
 
 namespace nix {
 
-static void prim_patch(EvalState & state, const PosIdx pos, Value * * args, Value & v)
+static void prim_patch(EvalState & state, const PosIdx pos, Value ** args, Value & v)
 {
  std::vector<std::string> patches;
  std::optional<SourcePath> src;
 
- state.forceAttrs(*args[0], pos,
- "while evaluating the first argument to 'builtins.patch'");
+ state.forceAttrs(*args[0], pos, "while evaluating the first argument to 'builtins.patch'");
 
  for (auto & attr : *args[0]->attrs()) {
  std::string_view n(state.symbols[attr.name]);
 
- auto check = [&]()
- {
+ auto check = [&]() {
  if (!patches.empty())
- state.error<EvalError>(
- "'builtins.patch' does not support both 'patches' and 'patchFiles'")
- .atPos(attr.pos).debugThrow();
+ state.error<EvalError>("'builtins.patch' does not support both 'patches' and 'patchFiles'")
+ .atPos(attr.pos)
+ .debugThrow();
  };
 
  if (n == "src") {
  NixStringContext context;
- src.emplace(state.coerceToPath(pos, *attr.value, context,
-   "while evaluating the 'src' attribute passed to 'builtins.patch'"));
+ src.emplace(state.coerceToPath(
+ pos, *attr.value, context, "while evaluating the 'src' attribute passed to 'builtins.patch'"));
  }
 
  else if (n == "patchFiles") {
  check();
- state.forceList(*attr.value, attr.pos,
- "while evaluating the 'patchFiles' attribute passed to 'builtins.patch'");
+ state.forceList(
+ *attr.value, attr.pos, "while evaluating the 'patchFiles' attribute passed to 'builtins.patch'");
  for (auto elem : attr.value->listItems()) {
  // FIXME: use realisePath
  NixStringContext context;
- auto patchFile = state.coerceToPath(attr.pos, *elem, context,
- "while evaluating the 'patchFiles' attribute passed to 'builtins.patch'");
+ auto patchFile = state.coerceToPath(
+ attr.pos, *elem, context, "while evaluating the 'patchFiles' attribute passed to 'builtins.patch'");
  patches.push_back(patchFile.readFile());
  }
  }
@@ -50,20 +48,18 @@ static void prim_patch(EvalState & state, const PosIdx pos, Value * * args, Valu
  }
 
  else
- state.error<EvalError>(
- "attribute '%s' isn't supported in call to 'builtins.patch'", n)
- .atPos(pos).debugThrow();
+ state.error<EvalError>("attribute '%s' isn't supported in call to 'builtins.patch'", n)
+ .atPos(pos)
+ .debugThrow();
  }
 
  if (!src)
- state.error<EvalError>(
- "attribute 'src' is missing in call to 'builtins.patch'")
- .atPos(pos).debugThrow();
+ state.error<EvalError>("attribute 'src' is missing in call to 'builtins.patch'").atPos(pos).debugThrow();
 
  if (!src->path.isRoot())
  throw UnimplementedError("applying patches to a non-root path ('%s') is not yet supported", src->path);
 
- auto accessor = makePatchingInputAccessor(src->accessor, patches);
+ auto accessor = makePatchingSourceAccessor(src->accessor, patches);
 
  state.registerAccessor(accessor);
 

src/libfetchers/github.cc

@@ -7,7 +7,6 @@
 #include "git.hh"
 #include "fetchers.hh"
 #include "fetch-settings.hh"
-#include "input-accessor.hh"
 #include "tarball.hh"
 #include "tarfile.hh"
 #include "git-utils.hh"

src/libfetchers/patching-input-accessor.cc

@@ -1,18 +1,16 @@
-#include "input-accessor.hh"
+#include "patching-input-accessor.hh"
 #include "processes.hh"
 
 namespace nix {
 
 // TODO: handle file creation / deletion.
-struct PatchingInputAccessor : InputAccessor
+struct PatchingSourceAccessor : SourceAccessor
 {
- ref<InputAccessor> next;
+ ref<SourceAccessor> next;
 
  std::map<CanonPath, std::vector<std::string>> patchesPerFile;
 
- PatchingInputAccessor(
- ref<InputAccessor> next,
- const std::vector<std::string> & patches)
+ PatchingSourceAccessor(ref<SourceAccessor> next, const std::vector<std::string> & patches)
  : next(next)
  {
  /* Extract the patches for each file. */
@@ -21,13 +19,14 @@ struct PatchingInputAccessor : InputAccessor
  std::string_view start;
  std::string_view fileName;
 
- auto flush = [&]()
- {
- if (start.empty()) return;
+ auto flush = [&]() {
+  if (start.empty())
+   return;
  auto contents = start.substr(0, p.data() - start.data());
  start = "";
  auto slash = fileName.find('/');
- if (slash == fileName.npos) return;
+ if (slash == fileName.npos)
+ return;
  fileName = fileName.substr(slash);
  auto end = fileName.find('\t');
  if (end != fileName.npos)
@@ -47,13 +46,8 @@ struct PatchingInputAccessor : InputAccessor
  }
 
  if (!start.empty()) {
- if (!(hasPrefix(line, "+++ ")
- || hasPrefix(line, "@@")
- || hasPrefix(line, "+")
- || hasPrefix(line, "-")
- || hasPrefix(line, " ")
- || line.empty()))
- {
+ if (!(hasPrefix(line, "+++ ") || hasPrefix(line, "@@") || hasPrefix(line, "+")
+ || hasPrefix(line, "-") || hasPrefix(line, " ") || line.empty())) {
  flush();
  }
  }
@@ -110,11 +104,9 @@ struct PatchingInputAccessor : InputAccessor
  }
 };
 
-ref<InputAccessor> makePatchingInputAccessor(
- ref<InputAccessor> next,
- const std::vector<std::string> & patches)
+ref<SourceAccessor> makePatchingSourceAccessor(ref<SourceAccessor> next, const std::vector<std::string> & patches)
 {
- return make_ref<PatchingInputAccessor>(next, patches);
+ return make_ref<PatchingSourceAccessor>(next, patches);
 }
 
 }

src/libfetchers/patching-input-accessor.hh

@@ -1,11 +1,9 @@
 #pragma once
 
-#include "input-accessor.hh"
+#include "source-accessor.hh"
 
 namespace nix {
 
-ref<InputAccessor> makePatchingInputAccessor(
- ref<InputAccessor> next,
- const std::vector<std::string> & patches);
+ref<SourceAccessor> makePatchingSourceAccessor(ref<SourceAccessor> next, const std::vector<std::string> & patches);
 
 }

src/libfetchers/path.cc

@@ -118,7 +118,7 @@ struct PathInputScheme : InputScheme
  throw Error("cannot fetch input '%s' because it uses a relative path", input.to_string());
  }
 
- std::pair<ref<InputAccessor>, Input> getAccessor(ref<Store> store, const Input & input) const override
+ std::pair<ref<SourceAccessor>, Input> getAccessor(ref<Store> store, const Input & input) const override
  {
  auto absPath = getAbsPath(input);
  auto input2(input);
@@ -130,8 +130,7 @@ struct PathInputScheme : InputScheme
 
  if (!storePath || storePath->name() != input.getName() || !store->isValidPath(*storePath)) {
  Activity act(*logger, lvlChatty, actUnknown, fmt("copying '%s' to the store", absPath));
- PosixSourceAccessor accessor;
- storePath = store->addToStore(input.getName(), accessor, absPath);
+ storePath = store->addToStore(input.getName(), *makeFSSourceAccessor(), absPath);
  auto narHash = store->queryPathInfo(*storePath)->narHash;
  input2.attrs.insert_or_assign("narHash", narHash.to_string(HashFormat::SRI, true));
  } else
@@ -151,7 +150,7 @@ struct PathInputScheme : InputScheme
  return {makeStorePathAccessor(store, *storePath), std::move(input2)};
 
  } else {
- auto accessor = makeFSInputAccessor(std::filesystem::path(absPath.abs()));
+ auto accessor = makeFSSourceAccessor(std::filesystem::path(absPath.abs()));
  accessor->setPathDisplay(absPath.abs());
  return {accessor, std::move(input2)};
  }

src/nix/flake.cc

@@ -858,9 +858,9 @@ struct CmdFlakeInitCommon : virtual Args, EvalCommand
  auto from2 = from / name;
  auto to2 = to / name;
  auto st = from2.lstat();
- if (st.type == InputAccessor::tDirectory)
+ if (st.type == SourceAccessor::tDirectory)
  copyDir(from2, to2);
- else if (st.type == InputAccessor::tRegular) {
+ else if (st.type == SourceAccessor::tRegular) {
  auto contents = from2.readFile();
  if (pathExists(to2.abs())) {
  auto contents2 = readFile(to2.abs());
@@ -874,7 +874,7 @@ struct CmdFlakeInitCommon : virtual Args, EvalCommand
  } else
  writeFile(to2.abs(), contents);
  }
- else if (st.type == InputAccessor::tSymlink) {
+ else if (st.type == SourceAccessor::tSymlink) {
  auto target = from2.readLink();
  if (pathExists(to2.abs())) {
  if (readLink(to2.abs()) != target) {