maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(3p/nix/libstore): Replace logging.h with glog

Browse source
This commit is contained in:
Vincent Ambo 2020-05-19 01:02:44 +01:00
parent ce99ba42df
commit 505b6b044b
25 changed files with 514 additions and 464 deletions
Download patch file Download diff file Expand all files Collapse all files

6
third_party/nix/src/libutil/meson.build vendored
View file

@ -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 = [

21
third_party/nix/src/libutil/prefork-compat.hh vendored Normal file
View file

@ -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_