diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-19T00·02+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-19T00·04+0100 |
| commit | 505b6b044b132b28e1501491bcfe6bd68ca1989e (patch) | |
| tree | 1c1ed8a195f5c94050754316c842a3f8623c6cbe /third_party/nix/src/libutil | |
| parent | ce99ba42df493bb521f47789fb8902d7693c5b9c (diff) | |
refactor(3p/nix/libstore): Replace logging.h with glog r/756
Diffstat (limited to 'third_party/nix/src/libutil')
| -rw-r--r-- | third_party/nix/src/libutil/meson.build | 6 | ||||
| -rw-r--r-- | third_party/nix/src/libutil/prefork-compat.hh | 21 |
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 5fb3e4804b..325a7d33ba 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 0000000000..ae9c25e539 --- /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_ |