about summary refs log tree commit diff
path: root/third_party/nix/src/libutil
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/nix/src/libutil')
-rw-r--r--third_party/nix/src/libutil/meson.build6
-rw-r--r--third_party/nix/src/libutil/prefork-compat.hh21
2 files changed, 25 insertions, 2 deletions
diff --git a/third_party/nix/src/libutil/meson.build b/third_party/nix/src/libutil/meson.build
index 5fb3e4804bc3..325a7d33baa7 100644
--- a/third_party/nix/src/libutil/meson.build
+++ b/third_party/nix/src/libutil/meson.build
@@ -11,7 +11,8 @@ libutil_src = files(
     join_paths(meson.source_root(), 'src/libutil/serialise.cc'),
     join_paths(meson.source_root(), 'src/libutil/thread-pool.cc'),
     join_paths(meson.source_root(), 'src/libutil/util.cc'),
-    join_paths(meson.source_root(), 'src/libutil/xml-writer.cc'))
+    join_paths(meson.source_root(), 'src/libutil/xml-writer.cc'),
+)
 
 libutil_headers = files(
     join_paths(meson.source_root(), 'src/libutil/affinity.hh'),
@@ -27,13 +28,14 @@ libutil_headers = files(
     join_paths(meson.source_root(), 'src/libutil/lru-cache.hh'),
     join_paths(meson.source_root(), 'src/libutil/monitor-fd.hh'),
     join_paths(meson.source_root(), 'src/libutil/pool.hh'),
+    join_paths(meson.source_root(), 'src/libutil/prefork-compat.hh'),
     join_paths(meson.source_root(), 'src/libutil/ref.hh'),
     join_paths(meson.source_root(), 'src/libutil/serialise.hh'),
     join_paths(meson.source_root(), 'src/libutil/sync.hh'),
     join_paths(meson.source_root(), 'src/libutil/thread-pool.hh'),
     join_paths(meson.source_root(), 'src/libutil/types.hh'),
     join_paths(meson.source_root(), 'src/libutil/util.hh'),
-    join_paths(meson.source_root(), 'src/libutil/xml-writer.hh')
+    join_paths(meson.source_root(), 'src/libutil/xml-writer.hh'),
 )
 
 libutil_dep_list = [
diff --git a/third_party/nix/src/libutil/prefork-compat.hh b/third_party/nix/src/libutil/prefork-compat.hh
new file mode 100644
index 000000000000..ae9c25e5397b
--- /dev/null
+++ b/third_party/nix/src/libutil/prefork-compat.hh
@@ -0,0 +1,21 @@
+// This file exists to preserve compatibility with the pre-fork
+// version of Nix (2.3.4).
+//
+// During the refactoring, various structures are getting ripped out
+// and replaced with the dummies below while code is being cleaned up.
+
+#ifndef NIX_SRC_LIBUTIL_PREFORK_COMPAT_H_
+#define NIX_SRC_LIBUTIL_PREFORK_COMPAT_H_
+
+namespace nix::compat {
+
+// This is used in remote-store.cc for various things that expect the
+// old logging protocol when talking over the wire. It will be removed
+// hen the worker protocol is redone.
+enum [[deprecated("old logging compat only")]] Verbosity{
+    kError = 0, kWarn, kInfo, kTalkative, kChatty, kDebug, kVomit,
+};
+
+}  // namespace nix::compat
+
+#endif  // NIX_SRC_LIBUTIL_PREFORK_COMPAT_H_