Commit graph

10460 commits

Author SHA1 Message Date
Vincent Ambo
25393d8080 refactor(3p/nix): Introduce CMake as the build system for Nix
Completes the switch from Meson to CMake for the core build system in
Nix.

Meson was added originally because someone else had already done the
work for integrating it in Nix and it was an upgrade from the previous
setup.

However over time it became clear that Meson is not quite mature
enough for projects like Nix that have occasionally peculiar
configuration constraints.

Some issues encountered with Meson (some of these are due to the Meson
setup in Nix):

* Difficulty with generating correct compile_commands.json for
  external tools like clangd
* Difficulty linking to libc++ when using clang
* Ugly shell invocations for certain parts of the build system (I want
  these to be gone!!!)

This CMake setup mimics the Meson configuration, but there are some
differences (some temporary):

* headers are now included separately for each library (see a previous
  commit that changes includes appropriately)
* autoheaders-style configuration is currently hardcoded. Before
  blindly copying this I want to evaluate how much of it actually exists
  for portability concerns that I don't have (such as support for OS
  X).
* Nix is built with libc++ by default.
* [libstore] SQL schema is now inlined via a generated header, not an
  included string literal

Abseil is still built as part of this build, rather than an external
dependency, because it chokes on differently configured compiler
invocations.

Note that because of the move to libc++ an unwanted behaviour is
introduced: glog log messages no longer have a body. I have yet to
debug what is going on there.
2020-05-28 00:11:25 +01:00
Vincent Ambo
3d7537da7f chore(3p/nix): Remove meson build files for core packages 2020-05-27 22:00:00 +01:00
Vincent Ambo
abe5df74a8 chore(3p/nix): Move Abseil symlink one layer up
This is required for upcoming build system changes.
2020-05-27 21:57:28 +01:00
Vincent Ambo
3652326ed2 refactor(3p/nix): Anchor local includes at src/
Previously all includes were anchored in one global mess of header
files. This moves the includes into filesystem "namespaces" (if you
will) for each sub-package of Nix.

Note: This commit does not introduce the relevant build system changes.
2020-05-27 21:56:34 +01:00
Vincent Ambo
86a35d963d refactor(3p/abseil_cpp): Inline Nix derivation 2020-05-27 21:52:44 +01:00
Griffin Smith
9a430d5844 make insert-src-block handle #+NAME:d blocks
the name of a src block is part of the org-element, so need to go down a
line if it's present
2020-05-27 10:17:14 -04:00
Griffin Smith
d13ef4080d git filter to black from 100chars to 80chars 2020-05-27 09:53:27 -04:00
Griffin Smith
ef2f6f32c1 work email in work repos 2020-05-27 09:53:27 -04:00
Vincent Ambo
6941048b7e merge(3p/glog): Vendor glog from commit 'afe04691' 2020-05-27 01:26:39 +01:00
Vincent Ambo
afe04691ac Squashed 'third_party/glog/' content from commit 9ef754a3023
git-subtree-dir: third_party/glog
git-subtree-split: 9ef754a3023e6fd10f20fe53dfca96dd898182e3
2020-05-27 01:26:30 +01:00
Vincent Ambo
7dc094173b chore(3p): Remove glog override
This library is being vendored, hence the override doesn't matter
anymore.
2020-05-27 01:25:39 +01:00
Vincent Ambo
2e32ceb523 fix(3p/nix): Default-import depot from a relative path 2020-05-27 00:06:59 +01:00
Vincent Ambo
991cf97df2 feat(tools/emacs): Install and configure hound package at cs.tazj.in 2020-05-27 00:06:59 +01:00
Vincent Ambo
4947aa9ab3 fix(3p/git): Use git derivation from stable channel as base
unstable is, of course, not working correctly at the moment
2020-05-27 00:06:59 +01:00
Griffin Smith
a7a525d09a Gitignore result 2020-05-26 11:30:00 -04:00
Griffin Smith
db371a5a61 clang-tools, perhaps 2020-05-26 11:29:00 -04:00
Griffin Smith
da6724c979 use kubie from pkgs-unstable 2020-05-26 11:28:42 -04:00
Griffin Smith
9d6939dc4b Bat theme 2020-05-26 11:28:42 -04:00
Griffin Smith
0275aaec03 some adjustments to per-platform config 2020-05-26 11:28:42 -04:00
Griffin Smith
9b2dd5c20f break out an urbint development module 2020-05-26 11:28:42 -04:00
Griffin Smith
0e9a2388bf Start of an RTL-SDR module 2020-05-26 10:46:57 -04:00
Griffin Smith
82c0404c4f Make Tramp work
per
https://wxchen.wordpress.com/2012/05/20/getting-tramp-in-emacs-to-work-with-zsh-as-default-shell/,
make the PS1 etc. properly work with Tramp so I can edit stuff over
ssh (it's working quite well)
2020-05-26 10:44:00 -04:00
Griffin Smith
9036dc7c32 Beginnings of config for Darwin machines
Split out a platforms/ directory with a linux.nix and darwin.nix, and
starting splitting things out between the two
2020-05-26 10:43:19 -04:00
Griffin Smith
699da9cebd Drop nix-yapf-mode
we're using black now
2020-05-26 10:29:02 -04:00
Griffin Smith
77f6ed2206 Fix run-tests snippet
cider-test-run-ns-tests needs to be called interactively
2020-05-26 10:28:24 -04:00
Griffin Smith
723ff591ee Pre-format exec snippet 2020-05-26 10:28:16 -04:00
Griffin Smith
712f997de1 Binding to make org hls for requested changes 2020-05-26 10:22:37 -04:00
Vincent Ambo
dcb39d3198 feat(ops/nixos/camden): Index nixpkgs in hound
There is a local nixpkgs clone at /var/git/nixpkgs which must be
manually set to have 'master' point at the desired ref (hound only
supports master).
2020-05-26 11:55:13 +01:00
Vincent Ambo
fe45079d19 chore(3p): Expose nixpkgs commit to depot 2020-05-26 11:54:04 +01:00
Vincent Ambo
74a70896f2 feat(tools/emacs): Add vterm-send-ctrl-x function
This is useful if something accidentally opens nano.
2020-05-26 01:21:42 +01:00
Vincent Ambo
b9b741287a feat(ops/nixos/camden): Set up hound at cs.tazj.in 2020-05-26 00:19:27 +00:00
Vincent Ambo
587b0a8b0b feat(ops/nixos): Add a module for hound
This module sets up hound, a generic code search engine.
2020-05-26 00:18:53 +00:00
Vincent Ambo
68e384a77f ffeat(ops/nixos): Add a dummy to make depot available in modules
Because modules are not called via the default depot setup (for now
...), this introduces a dummy module that stores the depot tree itself
in the module configurations.

This makes it possible to write modules that use packages from the
depot.
2020-05-26 00:17:55 +00:00
Vincent Ambo
93ba78d6f4 revert(3p/git): Revert merge of git upstream at v2.26.2
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232, reversing
changes made to f2b211131f.
2020-05-26 00:06:52 +01:00
Vincent Ambo
6f8fbf4aa4 chore(tools/cheddar): Bump dependencies & upgrade to LLVM 10 2020-05-25 23:37:39 +01:00
Vincent Ambo
d95ebf83cb feat(3p/hound): Init hound package
Hound is a code searching tool that I intend to use while finding
something more fully featured.
2020-05-25 23:36:52 +01:00
Vincent Ambo
0b23d2e4bf chore(3p/naersk): Update to latest 'master' 2020-05-25 23:36:20 +01:00
Vincent Ambo
980bf5365c fix(nix/buildGo): Do not silently ignore filepath.Walk() errors 2020-05-25 23:24:57 +01:00
Vincent Ambo
14b52848f8 docs(3p/nix): Add a README explaining the goals of the fork 2020-05-25 16:39:18 +01:00
Griffin Smith
53b56744f4 Remove obsolete fixme comment
This has been fixed
2020-05-25 11:34:29 -04:00
Griffin Smith
db6ea02581 Begin a broken-out NestedMap type
Begin breaking out a NestedMap data structure, which existed in both the
variables for the new template system and the structure that stored
messages.
2020-05-25 11:21:19 -04:00
Vincent Ambo
bf452cbc2a refactor(3p/nix): Replace tokenizeStrings with absl::StrSplit
This function was a custom (and inefficient in the case of
single-character delimiters) string splitter which was used all over
the codebase. Abseil provides an appropriate replacement function.
2020-05-25 15:54:14 +01:00
Vincent Ambo
b99b368d17 refactor(3p/nix/libutil): Replace hasPrefix/Suffix with Abseil
Uses the equivalent absl::StartsWith and absl::EndsWith functions
instead.
2020-05-25 02:19:01 +01:00
Vincent Ambo
8cf1322a6f fix(3p/nix/libstore): Fix error condition when parsing generations 2020-05-25 01:24:37 +01:00
Vincent Ambo
98299da0fd refactor(3p/nix/libutil): Replace string2Int & trim functions
Replaces these functions with corresponding functions from Abseil,
namely absl::StripAsciiWhitespace and absl::SimpleAtoi.

In the course of doing this some minor things I encountered along the
way were also refactored.

This also changes the signatures of the various custom readFile
functions to use absl::string_view types.
2020-05-25 01:19:02 +01:00
Vincent Ambo
b371821db5 chore(3p/nix/libstore): Remove progress bar remnants from download 2020-05-24 23:36:49 +01:00
Vincent Ambo
f5aaa12f1d style(3p/nix): Remove 'using std::*' from xml-writer.hh
See previous commit for more details on why.
2020-05-24 23:19:09 +01:00
Vincent Ambo
838f86b0fd style(3p/nix): Remove 'using std::*' from types.hh
It is considered bad form to use things from includes in headers, as
these directives propagate to everywhere else and can make it
confusing.

types.hh (which is includes almost literally everywhere) had some of
these directives, which this commit removes.
2020-05-24 22:29:21 +01:00
Vincent Ambo
f30b2e610d chore(3p/nix): Enable cross-file-rename in clangd 2020-05-24 18:19:28 +01:00
Vincent Ambo
da9104767e chore(3p/nix): Make build type configurable 2020-05-24 17:53:42 +01:00