Commit graph

281 commits

Author SHA1 Message Date
Vincent Ambo
b3c9166b23 refactor(3p/nix/libexpr): state->allocBindings -> Bindings::NewGC
EvalState::allocBindings had little to do with Bindings, other than
returning them, and didn't belong in that class.
2020-05-22 16:57:36 +01:00
Vincent Ambo
e24466c795 fix(3p/nix/libexpr): Make new Bindings class visible to GC 2020-05-22 16:35:21 +01:00
Vincent Ambo
68e6e92a20 chore(3p/nix/libexpr): Delete Bindings::sort
This function does nothing anymore since the attributes are always
in-order.
2020-05-22 03:35:07 +01:00
Vincent Ambo
986a8f6b75 fix(3p/nix): Update for usage of new attribute set API
The new attribute set API uses the iterators of the btree_map
directly. This requires changes in various files because the internals
of libexpr are very entangled.

This code runs and compiles, but there is a bug causing empty
attribute sets to be assigned incorrectly.
2020-05-22 01:59:39 +01:00
Vincent Ambo
42205f27fc refactor(3p/nix/libexpr): Use absl::btree_map::iterator type
Instead of using a custom Args* iterator, use the one belonging to the
map type directly.
2020-05-22 01:59:36 +01:00
Vincent Ambo
ee4637e3a2 refactor(3p/nix/libexpr): Use absl::btree_map::merge for '//'
Instead of doing some sort of inline merge-sort of the two attribute
sets, use the attribute sets merge function.

This commit alone does not build and is not supposed to.
2020-05-22 01:52:03 +01:00
Vincent Ambo
28e347effe refactor(3p/nix/libexpr): Use absl::btree_map for AttrSets
This is the first step towards replacing the implementation of
attribute sets with an absl::btree_map.

Currently many access are done using array offsets and pointer
arithmetic, so this change is currently causing Nix to fail in various
ways.
2020-05-21 19:21:55 +01:00
Vincent Ambo
a162f4e825 refactor(3p/nix/libexpr): Use std::string as qualified type
Replaces most uses of `string` with `std::string`.

This came up because I removed the "types.hh" import from
"symbol-table.hh", which percolated through a bunch of files where
`string` was suddenly no longer defined ... *sigh*
2020-05-21 05:43:22 +01:00
Vincent Ambo
b97307056d docs(3p/nix/libexpr): Add clarifying comments to SymbolTable 2020-05-21 05:42:20 +01:00
Vincent Ambo
c395a48be2 fix(3p/nix): Compatibility with updated SymbolTable
The functions in SymbolTable have been renamed to match the Google
Style guide, and some debug-only functions have been removed.
2020-05-21 05:09:23 +01:00
Vincent Ambo
97e85f94e5 refactor(3p/nix/libexpr): Use absl::node_hash_set in SymbolTable
This replaces the previous use of std::unordered_set with
absl::node_hash_set.

This type was chosen because the current implementation requires
pointer stability.

This does not yet touch the 'Attr' struct.

As a bonus, the implementation of the SymbolTable struct is now
consolidated into a single header/implementation file pair.
2020-05-21 05:09:23 +01:00
Vincent Ambo
00017ace04 feat(3p/nix): Wrangle Meson/Nix/CMake into (temporary) submission
Meson is unable to use CMake in Nix to determine the internal
structure of the Abseil libraries.

This commit adds an explicit list of most of the Abseil targets that
are relevant (so far) and bundles them into a list that is linked
together.
2020-05-21 04:50:49 +01:00
Vincent Ambo
416c74009d chore(third_party): Bump nixpkgs to nixpkgs-unstable 2020-05-21 04:50:34 +01:00
Vincent Ambo
a3b48e6562 chore(3p/nix): Minor fixes to get rid of warnings 2020-05-21 00:24:12 +01:00
Vincent Ambo
9dfdf16a8d fix(3p/nix): Fix build of derivation if cmake is present
cmake automatically runs a configure hook which breaks the build,
since this isn't actually a cmake project. This hook is now disabled.

Additionally Abseil's sources are linked to an absolute derivation
path when the build launches, as opposed to the relative path used for
development builds.
2020-05-21 00:24:10 +01:00
Vincent Ambo
43677021e3 refactor(3p/nix): Apply clang-tidy's performance-* fixes
This applies the performance fixes listed here:

https://clang.llvm.org/extra/clang-tidy/checks/list.html
2020-05-20 22:58:43 +01:00
Vincent Ambo
689ef502f5 refactor(3p/nix): Apply clang-tidy's readability-* fixes
This applies the readability fixes listed here:

https://clang.llvm.org/extra/clang-tidy/checks/list.html
2020-05-20 22:27:37 +01:00
Vincent Ambo
d331d3a0b5 refactor(3p/nix): Apply clang-tidy's modernize-* fixes
This applies the modernization fixes listed here:

https://clang.llvm.org/extra/clang-tidy/checks/list.html

The 'modernize-use-trailing-return-type' fix was excluded due to my
personal preference (more specifically, I think the 'auto' keyword is
misleading in that position).
2020-05-20 04:33:07 +01:00
Vincent Ambo
fed31b2c9b feat(3p/nix): Add some initial Abseil build targets
These make it possible to link to Abseil strings.
2020-05-20 04:02:23 +01:00
Vincent Ambo
6dfef31374 fix(3p/abseil): Create position independent code
This makes it possible to link Abseil into shared libraries, e.g. the
various Nix libraries.
2020-05-20 04:01:41 +01:00
Vincent Ambo
e2fad0f0d2 feat(3p/nix): Add Abseil as a CMAKE subproject to Meson
Yep.

This is accomplished by symlinking the sources into the location
expected by Meson for subprojects.
2020-05-20 03:03:08 +01:00
Vincent Ambo
836d82592f chore(3p/abseil_cpp): Move build derivation into the correct place 2020-05-20 02:34:42 +01:00
Vincent Ambo
fc8dc48020 Add 'third_party/abseil_cpp/' from commit '768eb2ca2857342673fcd462792ce04b8bac3fa3'
git-subtree-dir: third_party/abseil_cpp
git-subtree-mainline: ffb2ae54be
git-subtree-split: 768eb2ca28
2020-05-20 02:32:24 +01:00
Vincent Ambo
ffb2ae54be chore(third_party/nix): Dump of minor accumulated changes
None of these are worthy of a specific commit, or even have a real
reason behind them, but I didn't want to lose them.
2020-05-20 01:10:44 +01:00
Vincent Ambo
88f337588c refactor(3p/nix): Make all single-argument constructors explicit
Implicit constructors can be confusing, especially in a codebase that
is already as unintentionally obfuscated as this one.

https://google.github.io/styleguide/cppguide.html#Explicit_Constructors
2020-05-19 22:02:23 +01:00
Vincent Ambo
3908732181 style(3p/nix): Final act in the brace-wrapping saga
This last change set was generated by a full clang-tidy run (including
compilation):

    clang-tidy -p ~/projects/nix-build/ \
      -checks=-*,readability-braces-around-statements -fix src/*/*.cc

Actually running clang-tidy requires some massaging to make it play
nice with Nix + meson, I'll be adding a wrapper or something for that soon.
2020-05-19 20:51:32 +01:00
Vincent Ambo
cf40d08908 chore(3p/nix): Remove OSX only 'resolve-system-dependencies' tool 2020-05-19 20:34:12 +01:00
Vincent Ambo
83f4c37adf style(3p/nix/libstore): Additional if/for bracing fixes 2020-05-19 19:40:31 +01:00
Vincent Ambo
af7282536a chore(3p/abseil-cpp): Bump version to 20200519-768eb2ca 2020-05-19 19:38:32 +01:00
Vincent Ambo
0b8415124d fix(3p/nix/libstore): Fix mistake introduced by bracing changes
This statement got included in a loop when it shouldn't have been. At
least it led to some funny derivation files!
2020-05-19 19:37:06 +01:00
Vincent Ambo
1841d93ccb style(3p/nix): Add braces around single-line for-loops
These were not caught by the previous clang-tidy invocation, but were
instead sorted out using amber[0] as such:

    ambr --regex 'for (\(.+\))\s([a-z].*;)' 'for $1 { $2 }'

[0]: https://github.com/dalance/amber
2020-05-19 19:04:08 +01:00
Vincent Ambo
867055133d style(3p/nix): Add braces around single-line conditionals
These were not caught by the previous clang-tidy invocation, but were
instead sorted out using amber[0] as such:

    ambr --regex 'if (\(.+\))\s([a-z].*;)' 'if $1 { $2 }'

[0]: https://github.com/dalance/amber
2020-05-19 18:55:58 +01:00
Vincent Ambo
c6a31838cd fix(3p/nix/libexpr): Declare value union types explicitly
Previously these structs were declared anonymously inside of the -
anonymous - union. This is not actually supported by the C++ standard,
but is merely a compiler-specific extension.

Unfortunately untangling this required a forward-declaration of the
Value type.
2020-05-19 18:19:35 +01:00
Vincent Ambo
b37ff365ad fix(3p/nix/libexpr): Use noexcept instead of throw() 2020-05-19 18:19:23 +01:00
Vincent Ambo
09cbc431cc fix(3p/nix): Fix incorrectly braced conditionals and loops
Fixes mistakes introduced by clang-tidy in the previous commit.
2020-05-19 18:01:12 +01:00
Vincent Ambo
b490742a51 style(3p/nix): Enforce braces around loops and conditionals
This change was generated with:

  fd -e cc -e hh | xargs -I{} clang-tidy {} -p ~/projects/nix-build/ \
    --checks='-*,readability-braces-around-statements' --fix \
    -fix-errors

Some manual fixes were applied because some convoluted unbraced
statements couldn't be untangled by clang-tidy.

This commit still includes invalid files, but I decided to clean them
up in a subsequent commit so that it becomes more obvious where
clang-tidy failed. Maybe this will allow for a bug-report to
clang-tidy.
2020-05-19 17:38:04 +01:00
Vincent Ambo
c758de9d22 style(3p/nix): Reformat all includes to match new style 2020-05-19 15:55:11 +01:00
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
ce99ba42df feat(3p/glog): Update glog version 2020-05-18 02:39:26 +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
aa54512ee2 chore(3p): Remove unused dependencies of Nix 2020-05-17 20:45:18 +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
Vincent Ambo
cf8cd640c1 feat(bin): Add ninja & meson CLI tools 2020-05-17 02:49:13 +01:00
Vincent Ambo
d97cf260a2 refactor(tools/emacs): Move third-party overrides to //third_party
EXWM and vterm are overridden, but this shouldn't be happening outside
of //third_party
2020-05-16 04:08:28 +01:00
Vincent Ambo
28a36a2b70 feat(third_party): Add Google's farmhash library 2020-05-08 18:39:43 +01:00
Vincent Ambo
12387550e3 feat(third_party): Add newer version of Abseil 2020-05-08 18:07:47 +01:00
Vincent Ambo
0d73739740 feat(3p/python/broadlink): Add max_devices discovery parameter
This makes it possible to terminate early if the number of devices on
the network is known.
2020-04-26 14:50:04 +01:00
Vincent Ambo
b597a1c143 feat(third_party/python): Vendor broadlink-python using git-subtree 2020-04-25 21:38:42 +01:00
Vincent Ambo
9d94a727b2 Add 'third_party/python/broadlink/' from commit '17968ef4d40e7cb484909b3ddad33d7795b80091'
git-subtree-dir: third_party/python/broadlink
git-subtree-mainline: 0f53060159
git-subtree-split: 17968ef4d4
2020-04-25 18:22:59 +01:00
Vincent Ambo
0f53060159 revert(third_party): Revert 20.03 channel bump
Reverts "Bump channel to a NixOS 20.03 release commit".

This reverts commit a629d7fdd4.

This commit moves to a 20.03 release commit, in which building
Chromium with VAAPI is broken.
2020-04-25 17:58:42 +01:00
Vincent Ambo
4deb439d2e feat(third_party/python): Package broadlink infrared library 2020-04-25 17:58:21 +01:00
Vincent Ambo
a629d7fdd4 chore(third_party): Bump channel to a NixOS 20.03 release commit
... maybe this even fixes my nginx issues.
2020-04-21 22:29:32 +01:00
Vincent Ambo
1faf44b3b3 feat(web/tvl): Add rendered graphviz graph to the page 2020-04-21 03:38:30 +01:00
Vincent Ambo
1ab6a8f263 fix(third_party/honk): Create a fake $HOME 2020-04-19 23:37:25 +01:00
Vincent Ambo
26a52edfdb feat(third_party): Add derivation for honk 2020-04-19 23:21:51 +01:00
Vincent Ambo
f1136cde16 fix(third_party/cgit): Correctly make "about links" on about page 2020-04-19 19:25:43 +00:00
Vincent Ambo
066d34b50e feat(ops/nixos/nugget): Add chromium with VAAPI patches
These patches enable hardware-accelerated video decoding, which is
useful for Stadia.

The main issue with this is that Hydra doesn't currently cache
Chromium with these patches, which means that it is built from scratch
which takes in the order of 5 hours on an otherwise unused nugget.
2020-04-17 12:43:25 +01:00
Vincent Ambo
f9063bc75d chore(third_party): Bump telega version 2020-04-04 21:34:05 +01:00
Vincent Ambo
0f3d11f541 chore(third_party): Remove Tailscale derivation
This is now part of nixpkgs itself.
2020-04-04 13:02:57 +01:00
Vincent Ambo
a0cb4703e8 chore(third_party/default): Bump NixOS channel to nixos-20.03 2020-04-04 13:01:42 +01:00
Vincent Ambo
0473307f87 feat(third_party/ffmpeg): Add "libnpp" support to ffmpeg
Builds ffmpeg with CUDA Toolkit as a dependency, which includes a
library called "libnpp" that provides something related to hardware
accelerated video stream resizing.

v0v
2020-04-04 02:36:20 +01:00
Vincent Ambo
a7342448bb chore(third_party): Remove ormolu 2020-04-02 22:04:39 +01:00
Vincent Ambo
65e533431a refactor: emacsPackagesNg -> emacsPackages
The former is now just an alias for the latter anyways.
2020-03-08 23:20:03 +00:00
Vincent Ambo
825acd60e4 chore(third_party): Bump nixos-unstable channel 2020-03-08 23:13:40 +00:00
Vincent Ambo
1f5d2d424c chore(third_party): Remove guile 3.0 override
I don't actually use guile at all, this was just for experimentation.
2020-03-01 01:07:48 +00:00
Vincent Ambo
33c2a27d77 chore(third_party): Remove pounce override
Pounce is now available at 1.1 from nixpkgs upstream and no longer
needs to be bumped manually.
2020-03-01 01:06:21 +00:00
Vincent Ambo
c905e4b69f fix(3p/cpp/googleapis): Add protos for Stackdriver Logging
Adds the proto definitions required for the Stackdriver Logging API.
This compiles, but I'm unsure whether it's actually correct because
there seems to be a lot of copy & paste in the build setup.
2020-02-26 15:27:22 +00:00
Vincent Ambo
366526eab1 feat(3p/cpp/googleapis): Add Nix build instructions 2020-02-26 15:06:37 +00:00