Merge pull request #12525 from DeterminateSystems/move-mounted-source…

…-accessor MountedSourceAccessor: Move to libutil
NixOS · Feb 19, 2025 · 2b3fed4 · 2b3fed4
2 parents f201446 + d7f2c1b
commit 2b3fed4
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 13 deletions.
diff --git a/src/libfetchers/git.cc b/src/libfetchers/git.cc
@@ -9,7 +9,6 @@
 #include "pathlocks.hh"
 #include "processes.hh"
 #include "git.hh"
-#include "mounted-source-accessor.hh"
 #include "git-utils.hh"
 #include "logging.hh"
 #include "finally.hh"

diff --git a/src/libfetchers/meson.build b/src/libfetchers/meson.build
@@ -54,7 +54,6 @@ sources = files(
   'github.cc',
   'indirect.cc',
   'mercurial.cc',
-  'mounted-source-accessor.cc',
   'path.cc',
   'registry.cc',
   'store-path-accessor.cc',
@@ -72,7 +71,6 @@ headers = files(
   'filtering-source-accessor.hh',
   'git-lfs-fetch.hh',
   'git-utils.hh',
-  'mounted-source-accessor.hh',
   'registry.hh',
   'store-path-accessor.hh',
   'tarball.hh',

diff --git a/src/libfetchers/mounted-source-accessor.hh b/src/libfetchers/mounted-source-accessor.hh
diff --git a/src/libutil/meson.build b/src/libutil/meson.build
@@ -153,6 +153,7 @@ sources = files(
   'json-utils.cc',
   'logging.cc',
   'memory-source-accessor.cc',
+  'mounted-source-accessor.cc',
   'position.cc',
   'posix-source-accessor.cc',
   'references.cc',

diff --git a/src/libfetchers/mounted-source-accessor.cc → src/libutil/mounted-source-accessor.cc b/src/libfetchers/mounted-source-accessor.cc → src/libutil/mounted-source-accessor.cc
@@ -1,4 +1,4 @@
-#include "mounted-source-accessor.hh"
+#include "source-accessor.hh"
 
 namespace nix {
 

diff --git a/src/libutil/source-accessor.hh b/src/libutil/source-accessor.hh
@@ -214,4 +214,6 @@ ref<SourceAccessor> getFSSourceAccessor();
  */
 ref<SourceAccessor> makeFSSourceAccessor(std::filesystem::path root);
 
+ref<SourceAccessor> makeMountedSourceAccessor(std::map<CanonPath, ref<SourceAccessor>> mounts);
+
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -214,4 +214,6 @@ ref<SourceAccessor> getFSSourceAccessor(); @@
      */
     ref<SourceAccessor> makeFSSourceAccessor(std::filesystem::path root);
+    ref<SourceAccessor> makeMountedSourceAccessor(std::map<CanonPath, ref<SourceAccessor>> mounts);
     }