diff --git a/src/libstore/binary-cache-store.cc b/src/libstore/binary-cache-store.cc index 274e47271..3cf2da70d 100644 --- a/src/libstore/binary-cache-store.cc +++ b/src/libstore/binary-cache-store.cc @@ -8,7 +8,7 @@ #include "nix/util/sync.hh" #include "nix/store/remote-fs-accessor.hh" #include "nix/store/nar-info-disk-cache.hh" -#include "nix/store/nar-accessor.hh" +#include "nix/util/nar-accessor.hh" #include "nix/util/thread-pool.hh" #include "nix/util/callback.hh" #include "nix/util/signals.hh" diff --git a/src/libstore/include/nix/store/meson.build b/src/libstore/include/nix/store/meson.build index 5d6626ff8..c17d6a9cb 100644 --- a/src/libstore/include/nix/store/meson.build +++ b/src/libstore/include/nix/store/meson.build @@ -55,7 +55,6 @@ headers = [ config_pub_h ] + files( 'machines.hh', 'make-content-addressed.hh', 'names.hh', - 'nar-accessor.hh', 'nar-info-disk-cache.hh', 'nar-info.hh', 'outputs-spec.hh', diff --git a/src/libstore/meson.build b/src/libstore/meson.build index d1b3666cc..e3425deb5 100644 --- a/src/libstore/meson.build +++ b/src/libstore/meson.build @@ -300,7 +300,6 @@ sources = files( 'make-content-addressed.cc', 'misc.cc', 'names.cc', - 'nar-accessor.cc', 'nar-info-disk-cache.cc', 'nar-info.cc', 'optimise-store.cc', diff --git a/src/libstore/remote-fs-accessor.cc b/src/libstore/remote-fs-accessor.cc index f7ca28ae2..582599f0d 100644 --- a/src/libstore/remote-fs-accessor.cc +++ b/src/libstore/remote-fs-accessor.cc @@ -1,6 +1,6 @@ #include #include "nix/store/remote-fs-accessor.hh" -#include "nix/store/nar-accessor.hh" +#include "nix/util/nar-accessor.hh" #include #include diff --git a/src/libutil/include/nix/util/meson.build b/src/libutil/include/nix/util/meson.build index 9a606e15d..b6677140e 100644 --- a/src/libutil/include/nix/util/meson.build +++ b/src/libutil/include/nix/util/meson.build @@ -50,6 +50,7 @@ headers = files( 'memory-source-accessor.hh', 'mounted-source-accessor.hh', 'muxable-pipe.hh', + 'nar-accessor.hh', 'os-string.hh', 'pool.hh', 'pos-idx.hh', diff --git a/src/libstore/include/nix/store/nar-accessor.hh b/src/libutil/include/nix/util/nar-accessor.hh similarity index 100% rename from src/libstore/include/nix/store/nar-accessor.hh rename to src/libutil/include/nix/util/nar-accessor.hh diff --git a/src/libutil/meson.build b/src/libutil/meson.build index 8b7a5d977..5290ff2d0 100644 --- a/src/libutil/meson.build +++ b/src/libutil/meson.build @@ -147,6 +147,7 @@ sources = [ config_priv_h ] + files( 'logging.cc', 'memory-source-accessor.cc', 'mounted-source-accessor.cc', + 'nar-accessor.cc', 'pos-table.cc', 'position.cc', 'posix-source-accessor.cc', diff --git a/src/libstore/nar-accessor.cc b/src/libutil/nar-accessor.cc similarity index 99% rename from src/libstore/nar-accessor.cc rename to src/libutil/nar-accessor.cc index 640b77540..6bcdf5f13 100644 --- a/src/libstore/nar-accessor.cc +++ b/src/libutil/nar-accessor.cc @@ -1,4 +1,4 @@ -#include "nix/store/nar-accessor.hh" +#include "nix/util/nar-accessor.hh" #include "nix/util/archive.hh" #include diff --git a/src/nix/cat.cc b/src/nix/cat.cc index bf58bb492..114e8d38e 100644 --- a/src/nix/cat.cc +++ b/src/nix/cat.cc @@ -1,6 +1,6 @@ #include "nix/cmd/command.hh" #include "nix/store/store-api.hh" -#include "nix/store/nar-accessor.hh" +#include "nix/util/nar-accessor.hh" #include "nix/util/serialise.hh" #include "nix/util/source-accessor.hh" diff --git a/src/nix/ls.cc b/src/nix/ls.cc index 9bf3c5996..ca6e20be8 100644 --- a/src/nix/ls.cc +++ b/src/nix/ls.cc @@ -1,6 +1,6 @@ #include "nix/cmd/command.hh" #include "nix/store/store-api.hh" -#include "nix/store/nar-accessor.hh" +#include "nix/util/nar-accessor.hh" #include "nix/main/common-args.hh" #include