Vincent Ambo
b508f5b91a
style(3p/nix): Change include formatting config for clang-format
...
Changes the configuration to regroup all includes. The include groups
will be (in this order):
1. (in .cc): Include of the corresponding header
2. Includes of C++ standard library headers
3. Includes of other external headers
4. Includes of local headers
2020-05-19 15:55:09 +01:00
Vincent Ambo
62c18c9898
fix(3p/nix): Set C++ style to "Google" in Emacs locals
2020-05-19 05:13:47 +01:00
Vincent Ambo
95a57f15ca
refactor(3p/nix/nix-*): Replace logging with glog in binaries
2020-05-19 04:52:47 +01:00
Vincent Ambo
9aa2ecd78c
refactor(3p/nix/nix-daemon): Remove activities from protocol
...
Removes the activity transfer that was previously nulled out from the
daemon protocol completely.
This might actually break Nix completely, I haven't tried yet, but
that's fine because this will be replaced with gRPC.
2020-05-19 04:51:45 +01:00
Vincent Ambo
c7be956f3f
style(3p/nix/libexpr): Reformat with clang-format
2020-05-19 04:51:01 +01:00
Vincent Ambo
f8deeb1442
chore(3p/nix/nix): Remove progress bar implementation
...
The progress bar has lots of complexity for little benefit. The
previous activity tracking stuff has been deleted as part of the
logging refactoring and I am not going to implement support for this
again for now.
2020-05-19 04:49:39 +01:00
Vincent Ambo
939dd9f817
refactor(3p/nix/libexpr): Replace logging.h with glog
2020-05-19 01:24:50 +01:00
Vincent Ambo
d0c44425e1
refactor(3p/nix/libmain): Replace logging.h with glog
2020-05-19 01:04:14 +01:00
Vincent Ambo
505b6b044b
refactor(3p/nix/libstore): Replace logging.h with glog
2020-05-19 01:04:14 +01:00
Vincent Ambo
6dc6c29fa4
refactor(3p/nix/libutil): Replace internal logging library with glog
2020-05-18 02:34:41 +01:00
Vincent Ambo
c584480cd4
chore(3p/nix/libutil): Remove logging implementation
2020-05-18 00:39:50 +01:00
Vincent Ambo
0335b91b93
feat(3p/nix): Add glog dependency
2020-05-17 23:58:51 +01:00
Vincent Ambo
e797b4d09b
chore(3p/nix): Always enable the garbage collector
...
It's unclear why this toggle existed, now it doesn't.
2020-05-17 22:27:53 +01:00
Vincent Ambo
168ef124ef
fix(3p/nix): Minor fixes to derivation
...
* version must be set to use this as the system Nix
* missing busybox path is now set
* fixed build output names
2020-05-17 21:25:50 +01:00
Vincent Ambo
8944370b7f
feat(3p/nix): Add new Meson-based derivation for building Nix
...
This builds the mesonified Nix and is compatible with the depot
structure and nix-shell.
2020-05-17 20:46:06 +01:00
Vincent Ambo
9d865dbb1f
chore(3p/nix): Remove symlink setup from Meson build
...
This belongs in the derivation itself, IMO.
2020-05-17 20:45:47 +01:00
Vincent Ambo
96700c9522
chore(3p/nix): Remove old build derivations
...
Removes the autotools-based build derivations, in favour of using a
simpler build that just wraps Meson.
2020-05-17 20:24:18 +01:00
Vincent Ambo
40395860c7
chore(3p/nix): Remove old build system and other miscellanies
...
There are still remnants of the old build system (for example, the
build derivations are not yet updated at all), but we'll get there.
2020-05-17 16:43:21 +01:00
Vincent Ambo
0f2cf531f7
style(3p/nix): Reformat project in Google C++ style
...
Reformatted with:
fd . -e hh -e cc | xargs clang-format -i
2020-05-17 16:31:57 +01:00
Vincent Ambo
65a1aae98c
fix(3p/nix): Fix Meson configuration for libexpr
2020-05-17 16:28:17 +01:00
Vincent Ambo
c94ef8d00b
chore(3p/nix): Use packages from depot tree
2020-05-17 16:28:15 +01:00
John Ericson
939cec746e
chore(3p/nix): Clean up libseccomp_dep
...
(cherry picked from commit b380f75867d48e6af461513d26803b61250d9c80)
2020-05-17 15:57:09 +01:00
John Ericson
adff9913c0
docs(3p/nix): Clean up descriptions in Meson
...
1. Fix that for libsodium
2. Consistently capitalize
(cherry picked from commit 12ce28bdf21d1f261132bdefe3dac25b1aab7dcc)
2020-05-17 15:57:04 +01:00
John Ericson
8481ff4351
fix(3p/nix): non-existent wrapper dependency .found() should be false too
...
(cherry picked from commit 90f9f4aef781fc5c3ead8652fc408a431f480905)
2020-05-17 15:56:50 +01:00
John Ericson
9c21176f57
chore(3p/nix): Make libsodium an auto dependency
...
This means do autodetection if the user doesn't specify.
(cherry picked from commit 1be6ab4d3eb4d6b04c322b9ed0a108c2b5354ec5)
2020-05-17 15:56:36 +01:00
Vincent Ambo
3f6f3356e8
feat(3p/nix/build): Add meson & ninja as nativeBuildDeps
2020-05-17 15:56:32 +01:00
John Ericson
6cbc248b3f
refactor(3p/nix): Remove abstractions in HAVE_STRUCT_DIRENT_D_TYPE code
...
(cherry picked from commit 727dc569a7a13b038d550b8c98a79d5928424d9b)
2020-05-17 15:56:28 +01:00
John Ericson
4b50bd28a0
feat(3p/nix): meson: Don't look for libraries in lib dir
...
1. First of all, this doesn't work in nixpkgs. Per [1], gcc ignores `-L`
for purposes of `--print-file-dirs`, which breaks horribly on linux. But
if we don't pass extra dirs, meosn first just tries `-l...`, which does
work.
2. Even if it did work, `libdir` means where we are installing libs, not
where libs are expected to be found. Those are not necessarily the
same (again, nixpkgs), and even when they are and non-standard, it is
better to use DESTDIR or have a modified toolchain.
[1]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87758
(cherry picked from commit a142164e746644e20f66908c156ca913bef4664f)
2020-05-17 15:56:23 +01:00
John Ericson
d64f60c733
feat(3p/nix): meson: Define HAVE_STRUCT_DIRENT_D_TYPE macro
...
(cherry picked from commit 7ae66bbef5e92f4a0bba49780d8c316f134884f2)
2020-05-17 15:56:19 +01:00
John Ericson
55e9f61041
chore(3p/nix): Add Meson and Ninja dependencies
...
(cherry picked from commit 3a968f5152d6f65ea3d9fdd36df3c188a4e20e24)
2020-05-17 15:56:13 +01:00
p01arst0rm
e52ce543a4
chore(3p/nix): more improvements
...
(cherry picked from commit 507d28fd226e018d5927b49b1bd07833cbd49d25)
2020-05-17 15:55:31 +01:00
p01arst0rm
9974eca8a0
feat(3p/nix): minor improvements
...
(cherry picked from commit f6f7046acfaf90c19c597687d384b491c852b4c6)
2020-05-17 15:55:27 +01:00
p01arst0rm
055139ac6a
feat(3p/nix): added meson support
...
(cherry picked from commit 086a81b7a5bbe1fc022efb5935ff68f6ad71ddaf)
2020-05-17 15:55:13 +01:00
Vincent Ambo
c455f7a987
feat(third_party/nix): Add clang-format configuration
2020-05-17 15:53:25 +01:00
Vincent Ambo
7994fd1d54
Add 'third_party/nix/' from commit 'be66c7a6b24e3c3c6157fd37b86c7203d14acf10'
...
git-subtree-dir: third_party/nix
git-subtree-mainline: cf8cd640c1
git-subtree-split: be66c7a6b24e3c3c6157fd37b86c7203d14acf10
2020-05-17 15:52:38 +01:00