Commit Graph

280 Commits

Author SHA1 Message Date
Emily
7959a16c19 nixos-option: use C++20
Nix uses `-std=c++2a` and the header files require C++20 features. LLVM
is more strict about this, so the build was failing there.
2023-07-13 08:25:28 +10:00
Sandro
f57af4cd1e
Merge pull request #237442 from SuperSandro2000/nixos-option
nixos-option: update to nix 2.15
2023-07-12 00:14:53 +02:00
Sandro Jäckel
38e917e4bf
nixos-option: update to nix 2.15
Co-authored-by: tropf <29873239+tropf@users.noreply.github.com>
2023-07-11 17:13:21 +02:00
figsoda
151b1854f6 nix-init: 0.2.3 -> 0.2.4
Diff: https://github.com/nix-community/nix-init/compare/v0.2.3...v0.2.4

Changelog: https://github.com/nix-community/nix-init/blob/v0.2.4/CHANGELOG.md
2023-07-06 18:34:04 -04:00
pennae
be4d19ff1a doc: render nixpkgs manual with nrd
also updates nixdoc to 2.3.0. the nixdoc update is not a separate commit
because that would leave the manual build broken for one commit,
potentially breaking bisects and rebases.
2023-07-01 20:59:29 +02:00
pennae
538b3d1b3c nixos-render-docs: add footnote support
this is only used in the stdenv chapter, but footnotes could be useful
in other places as well. since markdown-it has a plugin to parse
footnote syntax we may as well just support them even if they're rare.
2023-07-01 20:27:29 +02:00
pennae
ac7be1f106 nixos-render-docs: add support for tables 2023-07-01 20:27:29 +02:00
pennae
8fb4cf8b7c nixos-render-docs: add support for figures 2023-07-01 20:27:29 +02:00
pennae
e5e738b72a nixos-render-docs: genericize block numbering
examples and figures behave identically regarding numbering and titling,
they just don't share a common number space. make the numbering/titling
function generic over block types now so figures can just use it.
2023-07-01 20:27:29 +02:00
pennae
8c2d14a6b8 nixos-render-docs: add image support
currently only supported for html. docbook could also support images,
but it's on the way out for manual generation anyway so we won't add
image support there. options docs can't use images because they also
target manpages, which leaves no viable users.
2023-07-01 20:27:28 +02:00
pennae
b962ff92ff nixos-render-docs: add support for section tocs
the nixpkgs manual uses section tocs for eg the nixpkgs library function
reference. we will only not emit tocs for subsections at this point, but
maybe we should consider doing so in the future.
2023-07-01 18:21:16 +02:00
pennae
2bf3bb4f6b nixos-render-docs: hide nav headers/footers if not needed
there's not point in rendering these if we're rendering to a single file
for all content.
2023-07-01 17:31:29 +02:00
pennae
effbaf0ab4 nixos-render-docs: maybe omit link target files
docbook always emits intra-file links if only a single file is emitted.
it doesn't seem to do this for intra-file links when multiple files are
emitted, so we don't do that yet either.
2023-07-01 17:31:29 +02:00
pennae
8c33134465 nixos-render-docs: don't double-escape link titles 2023-07-01 17:31:29 +02:00
Pol Dellaiera
246000e996 nixos/manual: fix html <p> tag closure 2023-06-28 13:50:48 +02:00
pennae
03ca5a47c1 nixos-render-docs: add missing head tag to html output 2023-06-26 21:13:11 +02:00
figsoda
0415163b68 nixpkgs-lint-community: init at 0.3.0
https://github.com/nix-community/nixpkgs-lint
2023-06-22 10:07:47 -04:00
pennae
c8b4e5d557
Merge pull request #237557 from pennae/dedocbookify-nixos
nixos/doc: dedocbookify
2023-06-19 14:05:03 +02:00
Victor Engmark
7b396875bb nixos-render-docs: De-lint using ruff --fix
This automated de-linting has applied a few different refactors:

- Remove unused imports and variables
- Change f-strings with no variables to regular strings
- Remove trailing semicolon
2023-06-14 14:39:00 +12:00
pennae
34eeac5544 nixos-render-docs: default to markdown for options
docbook is now gone and we can flip the defaults. we won't keep the
command line args around (unlike the make-options-docs argument) because
nixos-render-docs should not be considered an exposed API.
2023-06-13 16:56:31 +02:00
pennae
5f35ae16ec nixos-render-docs: remove literalDocBook support
with literalDocBook itself gone we can also remove the support code in
nixos-render-docs.
2023-06-13 16:56:30 +02:00
figsoda
f03d84d954 gridlock: init at unstable-2023-03-03
https://github.com/lf-/gridlock
2023-05-29 16:52:16 -04:00
maralorn
4414a2d948 nix-output-monitor: 2.0.0.5 -> 2.0.0.6
* Small improvements in error reporting.
* Significant performance improvements.
2023-05-14 23:11:42 +02:00
maralorn
72b021051f nix-output-monitor: comment and cleanup 2023-05-14 23:10:00 +02:00
John Ericson
57445260f0
Merge pull request #229113 from aschmolck/fix-nix-info-help
Fix nix-info --help to exit 0
2023-05-10 17:33:33 -04:00
Sandro Jäckel
00000001b4
treewide: switch builtins.fromJSON(builtins.readFile ./file.json) to lib.importJSON ./file.json #2 2023-05-06 16:20:13 +02:00
pennae
407f6196a2 nixos-render-docs: add examples support
the nixos manual contains enough examples to support them as a proper
toc entity with specialized rendering, and if in the future the nixpkgs
wants to use nixos-render-docs we will definitely have to support them.
this also allows us to restore some examples that were lost in previous
translation steps because there were too few to add renderer support
back then.
2023-05-03 19:58:21 +02:00
Alexander Schmolck
eb811a6ee0 nix-info: fix nix-info --help to exit 0
Previously, --help and -h were treated like an invalid argument.
2023-04-30 13:04:09 +01:00
figsoda
87b94e2e4f nix-init: 0.2.2 -> 0.2.3
Diff: https://github.com/nix-community/nix-init/compare/v0.2.2...v0.2.3

Changelog: https://github.com/nix-community/nix-init/blob/v0.2.3/CHANGELOG.md
2023-04-29 19:27:22 -04:00
figsoda
a6e90dec5f nix-melt: init at 0.1.2 2023-04-26 10:58:09 -04:00
figsoda
c58c844b36 nix-init: 0.2.1 -> 0.2.2
Diff: https://github.com/nix-community/nix-init/compare/v0.2.1...v0.2.2

Changelog: https://github.com/nix-community/nix-init/blob/v0.2.2/CHANGELOG.md
2023-04-23 10:49:07 -04:00
figsoda
d9d363bf3c nixpkgs-hammering: unstable-2022-11-15 -> unstable-2023-03-09
Diff: 1b038ef38f...243b81c687
2023-04-17 10:16:47 -04:00
Dennis Gosnell
c00dc0cf7d
Merge remote-tracking branch 'origin/master' into haskell-updates 2023-03-27 08:42:30 +09:00
Yureka
f8cbc3c281 tree-wide: convert rust with git deps to importCargoLock 2023-03-26 01:52:04 +01:00
Dennis Gosnell
9b7cbce8b2
Merge remote-tracking branch 'origin/master' into haskell-updates 2023-03-23 07:42:17 +09:00
Dennis Gosnell
3009eda91b
nix-output-monitor: use hermes-json-0.2.0.1 2023-03-22 21:46:11 +09:00
figsoda
80a7ce3920 nix-init: 0.2.0 -> 0.2.1
Diff: https://github.com/nix-community/nix-init/compare/v0.2.0...v0.2.1

Changelog: https://github.com/nix-community/nix-init/blob/v0.2.1/CHANGELOG.md
2023-03-21 21:04:45 -04:00
figsoda
f129d39c77 nix-init: 0.1.1 -> 0.2.0
Diff: https://github.com/nix-community/nix-init/compare/v0.1.1...v0.2.0

Changelog: https://github.com/nix-community/nix-init/blob/v0.2.0/CHANGELOG.md
2023-03-20 09:41:23 -04:00
Sandro Jäckel
d1a388ae8e
nixos-render-docs: use packageOverrides to construct python packages 2023-03-14 00:12:34 +01:00
Artturin
47ace7b0af pkgs/tools/nix: enable strictDeps
`fd "\.nix" pkgs/tools/nix | xargs rg "strictDeps" --files-without-match | xargs rg "buildRust|buildGo|buildPyt|buildNim" --files-without-match | xargs vim -p`

checked with Artturin/diffing
2023-03-07 18:13:44 +02:00
pennae
36f04733dd nixos-render-docs: add manual html converter
this converter is currently supposed to be able to reproduce the
docbook-generated html DOMs exactly, though not necessarily the
html *files*. it mirrors many docbook behaviours that seem rather odd,
such as top-level sections in chapters using the same heading depth as
understood by html as their parent chapters do. over time we can
hopefully remove all special casing needed to reproduce docbook
rendering, but for now at least it doesn't hurt *too* much.
2023-02-21 18:26:41 +01:00
pennae
feaa97e5dc nixos-render-docs: render directly from file to file
this will be necessary for html since there we have to do chunking into
multiple files ourselves. writing one file from the caller of the
converter and all others from within the converter is unnecessarily
spread out, and returning a dict of file names and their contents is not
quite as meaningful for docbook (which has only one file to begin with).
2023-02-21 18:26:41 +01:00
pennae
d520d55dee nixos-render-docs: add options html renderer
it's not hooked up to anything yet, but that will come soon. there's a
bit of docbook compat here that must be interoperable with the actual
docbook exporter, but luckily it's not all that much.
2023-02-21 18:26:41 +01:00
pennae
82e62614e9 nixos-render-docs: add html renderer
the basic html renderer. it doesn't have all the docbook compatibility
codes embedded into it, but there is a good amount. this renderer is
unaware of manual structure and does not traverse structural include
tokens (if it finds any it'll just fail), that task falls to derived
classes. once we have more uses for structural includes than just the
manual we may revisit this decision.
2023-02-21 18:26:41 +01:00
pennae
7a74ce51a1 nixos-render-docs: add toc generator
the docbook toolchain uses docbook-xsl to generate its TOC, our html
renderer will have to do this on its own. this generator uses a very
straight-forward algorithm of only inspecting headings, but anything
else could be inspected as well. (examples come to mind, but those do
not have titles and would thus make for bad toc entries)

we also use path information (that will be taken from include block args
in the html renderer) to produce navigation information. the algorithm
we use mirrors what docbook does, linking to the next/previous files in
depth-first toc order.

toc entries are linked to the tokens they refer to for easy use later.
2023-02-21 18:26:41 +01:00
pennae
23dc31a975 nixos-render-docs: allow for options in include blocks
while docbook relies on external chunk-toc info to do chunking of the
rendered manual we have nothing of the sort for html. there it seems
easiest to add annotations to blocks to create new chunks. such
annotations could be extended to docbook to create the chunk-toc instead
of passing it in externally, but with docbook on the way out that seems
like a waste of effort.
2023-02-21 18:26:41 +01:00
pennae
768794d6c1 nixos-render-docs: check book structure
text content in the toplevel file of a book will not render properly.
the first proper element will be a preface, part, or chapter anyway, and
those require includes to produce.

parts do not currently allow headings in the part file itself, but
that's mainly a renderer limitation. we can add support for headings in
part intros when we need them

in all other cases includes must be followed by either another include,
a heading, or end of file. text content could not be properly linked to
from a TOC without a preceding heading.
2023-02-21 18:26:40 +01:00
pennae
163b667352 nixos-render-docs: require headings to have ids
without this we cannot build a TOC to arbitrary depth without generating
ids for headings, but generated ids are fragile and liable to either
break or point to different things if the manual changes shape. we
already have the convention that all headings should have an id, this
formalizes it.
2023-02-21 18:26:40 +01:00
pennae
ba20114460 nixos-render-docs: check heading continuity
while not technically necessary for correct rendering of *contents* we
do need to disallow heading levels being skipped to build a correct
TOC. treating headings that have skipped a number of levels to actually
be headings that many levels up only gets confusing, and inserting
artifical intermediate headings suffers from problems, such as which ids
to use and what to call them.
2023-02-21 18:26:40 +01:00
pennae
7b0824c003 nixos-render-docs: check heading presence during parsing
check that all required headings are present during parsing, not during
rendering. building a correct TOC will need this since every TOC entry
needs a heading to set its title, and every included substructure needs
a title.

also improve the error message on repeated title headings slightly,
giving the end line turns out to not be very useful.
2023-02-21 18:26:40 +01:00