3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

453208 commits

Author SHA1 Message Date
pennae 8b7f0e559a nixos/manual: clean up default.nix a bit
- inline copySources into single user
- remove `inherit sources` where it's not necessary
- inline generatedSources. this will go away completely soon so we may
  as well.
- inline modulesDoc into manual-combined. this too will go away soon.
- inline sources into manual-combined. this too will go away soon.
2023-02-12 11:58:20 +01:00
pennae ef413e3eac nixos/manual: split manpages-combined from manual-combined
once we generate the entire manual-combined.xml with a single
nixos-render-docs invocation we will no longer need any options xml
files. likewise we do not need the test options xml in the manpage
build. splitting manpages-combined from manual-combined also allows
these two to run in parallel, slightly improving build times.
2023-02-12 11:56:26 +01:00
pennae 9977f99740 nixos/manual: inline man-configuration.xml
man-configuration.xml is the only manpage we build using docbook at this
time, and man-pages.xml includes just this one file. inline
man-configuration.nix into man-pages.xml so we can refer to a single
file to grab the manpage sources later rather than using find-by-suffix.
2023-02-12 11:55:10 +01:00
pennae d30da4d9cd nixos-render-docs: add support for <part>
<part> is different from all other blocks we care about in that it
requires textual content to be wrapped in <partintro>. add support for
this to the generic docbook renderer, which will just assume that a part
is the whole document start to finish. we do make provision for the
manual renderer to close a partintro tag early though.
2023-02-12 11:55:09 +01:00
pennae ad2b150af7 nixos-render-docs: use Mapping for options converter
this way we can pass in frozendicts from other converters.
2023-02-12 11:55:09 +01:00
pennae d004105003 nixos-render-docs: print exception trees by __cause__
__context__ is always set to the prior exception, even when not using
the raise from form. __cause__ is only set during raise from. use
__cause__ so we can override a leaf exception (eg KeyError to something
more meaningful).
2023-02-12 11:55:09 +01:00
Weijia Wang 99306697f8
Merge pull request #215633 from r-ryantm/auto-update/refurb
refurb: 1.10.0 -> 1.12.0
2023-02-10 07:17:14 +01:00
Weijia Wang 8f56be2182
Merge pull request #215600 from r-ryantm/auto-update/goresym
goresym: 2.1 -> 2.1.1
2023-02-10 07:12:44 +01:00
pennae cdabe91dd7
Merge pull request #215324 from pennae/md-to-db--
nixos/manual: remove md-to-db.sh
2023-02-10 07:10:13 +01:00
Weijia Wang 32b3026755
Merge pull request #181787 from kylesferrazza/update-watchman
Update watchman (and create all the packages it now depends on)
2023-02-10 07:09:44 +01:00
Weijia Wang 6f6c936608
Merge pull request #215618 from marsam/update-esbuild
esbuild: 0.17.5 -> 0.17.7
2023-02-10 07:01:14 +01:00
Weijia Wang cf75832779
Merge pull request #215606 from r-ryantm/auto-update/folly
folly: 2023.01.30.00 -> 2023.02.06.00
2023-02-10 06:56:05 +01:00
Weijia Wang 43709e7434
Merge pull request #215610 from dotlambda/insteon-frontend-home-assistant-0.3.1
python310Packages.insteon-frontend-home-assistant: 0.3.0 -> 0.3.1
2023-02-10 06:54:34 +01:00
Weijia Wang 35c77638ce
Merge pull request #215581 from LeSuisse/upx-4.0.2
upx: 3.96 -> 4.0.2
2023-02-10 06:51:32 +01:00
pennae d041641b1a nixos/manual: remove md-to-db
with manual chapters no longer needing pandoc for their conversion to
xml we can get rid of this source of confusion, and its huge cache of
xml files.
2023-02-10 06:40:15 +01:00
pennae 652a283e51 nixos-render-docs: render manual chapters during manual build
render all manual chapters to docbook from scratch every time the manual
is built. nixos-render-docs is quick enough at this to not worry about
the cost (needing only about a second), and it means we can remove
md-to-db.sh in the next commit.

no changes to the rendered html manual except for replacements and smartquotes.
2023-02-10 06:40:02 +01:00
pennae 67917ac102 nixos-render-docs: rename manual docbook converter to docbook-section
we'll soon add another docbook converter that does not emit a section as
a collection of chapters, but sections or chapters on their own. this
should clarify naming a bit before there can be any confusion.
2023-02-10 06:40:02 +01:00
pennae b59b0230ae nixos-render-docs: add example blocks
this is currently only supported by the docbook exporter, and even the
docbook exporter doesn't do much with them. we mirror the conversion
pandoc did for consistency with the previous manual chapter conversion,
which is to add just an anchor with the given id. future exporters that
go directly to html might want to do more.
2023-02-10 06:40:02 +01:00
pennae bb6526e0de nixos-render-docs: add generic attributed-block parsing
this is a subset of pandoc's fenced divs. currently we only use this for
admonitions (which get a new name to differentiate them from other kinds
of blocks), but more users will appear soon.
2023-02-10 06:40:02 +01:00
pennae 36b0f53f85 nixos-render-docs: promote compact-list attrs to core rule
rules are a better place for this. since _post_parse is now empty (and
presumably will never grow) we'll remove that as well.
2023-02-10 06:40:02 +01:00
pennae 6cd368870b nixos-render-docs: allow dots in heading ids
this is used by release notes (and we don't want to break links to
those), and is also technically allowed anyway. we will *not* extend the
regex to allow more characters just yet due to a mozilla recommendation
against it (cf https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/id)
2023-02-10 06:40:02 +01:00
pennae fd9f6c7501 nixos-render-docs: promote heading id extraction to a core rule
this should've been a core rule from the beginning. not being a core
rule made it always run after smartquotes and replacements, which
could've wrecked the id.
2023-02-10 06:40:02 +01:00
pennae 4b06b82130 nixos-render-docs: add the .keycap class
this lets us parse the `[F12]{.keycap}` syntax we recently introduced to
the nixos manual markdown sources. the docbook renderer emits the keycap
element for this class, the manpage renderer will reject it because it's
not entirely clear what to do with it: while html has <kbd> mandoc has
nothing of the sort, and with no current occurences in options doc we
don't have to settle on a (potentially bad) way to render these.
2023-02-10 06:40:01 +01:00
pennae 67086639e0 nixos-render-docs: add support for full attributed spans
this is pretty much what pandoc calls bracketed spans. since we only
want to support ids and classes it doesn't seem fair to copy the name,
so we'll call them "attributed span" for now. renderers are expected to
know about *all* classes they could encounter and act appropriately, and
since there are currently no classes with any defined behavior the most
appropriate thing to do for now is to reject all classes.
2023-02-10 06:40:01 +01:00
pennae 1c9f55ec64 nixos/manual: convert <kbd> elements to bracketed spans
since support for kbd elements was added with explicit intent in #175128
it seems like a good idea to support this in nixos-render-docs instead
of just dropping it in favor of `*F12*` etc. since it's a very rare
thing in the manual and purely presentational it makes sense to use
bracketed spans instead of a new myst role.

the html-elements.lua plugin is now somewhat misnamed, but it'll go away
very soon so we don't want to bother renaming it.
2023-02-10 06:40:01 +01:00
pennae 65d749c80b nixos/manual: inline the single footnote
this is a lot easier than adding footnote support for just the one
instance. if a use case for footnotes appears in the future (e.g. if we
wanted to render the nixpkgs manual with nixos-render-docs as well) this
decision should be reevaluated.
2023-02-10 06:40:01 +01:00
pennae 2ad93ab199 nixos/manual: remove remaining docbook tags
there's one remaining instance of literal docbook tags in the manual.
replace it with a literal (as has been done for package tags everywhere else).
2023-02-10 06:40:01 +01:00
pennae bb34d5d6d4 nixos/manual: replace ids on blocks with inline anchors
nixos-render-docs supports inline anchors, but not ids for blocks. it
seems wise to reserve blocks for special cases that don't have other
syntax already, like admonitions.
2023-02-10 06:40:01 +01:00
pennae 2e3d9e8d74 nixos/manual: remove .unnumbered section attributes
pandoc would drop these when converting to docbook, just like it dropped
.title block classes.
2023-02-10 06:40:01 +01:00
pennae a15d7335a5 nixos/manual: remove .title fenced divs
pandoc drops .title classes when rendering to docbook, so these are
effectively just paragraphs anyway. without support for including them
in a table of contents the complexity of parsing them in
nixos-render-docs won't be warranted.
2023-02-10 06:40:00 +01:00
pennae 8163651338 nixos/manual: fix option-declarations sections
the examples for mkPackageOption weren't terminated, leading to pretty
odd nesting of docbook (and thus html) elements. close them properly.

also turn the (likewise unclosed) fenced div containing just an anchor
id and a class that will be silently dropped to an inline anchor while
we're here. we'd have to convert it anyway later.
2023-02-10 06:40:00 +01:00
pennae ba4bcdc5e4 nixos/manual: remove some newlines from deflists
markdown-it parses deflists slitghtly differently than pandoc does. in
these two cases pandoc would find a deflist item while markdown-it would
not, instead it'd find a lone colon and the rest of the text.
2023-02-10 06:40:00 +01:00
pennae 861ebec769 nixos/manual: don't use multi-definitions in installer chapter
pandoc renders these to multiple docbook paragraphs in a single
definition for the term, not multiple *actual* definitions for the same
term. this is most likely not what is intended here, so let's use
multiple paragraphs instead.
2023-02-10 06:40:00 +01:00
pennae 7098315342 nixos/manual: delete disabled xincludes
userconfiguration.xml hasn't existed for a while, and this comment will
interfere with processing we'll be doing shortly.
2023-02-10 06:40:00 +01:00
pennae f1e888a53c nixos/manual: moving contributing chapter toc entry
this should be placed before the appendices, not between them. might
even have a good place in the development part, but that's a decision
for another day.
2023-02-10 06:40:00 +01:00
pennae 10f2c3cacf nixos/manual: remove sources input from manpages drv
it's not used. holdover from when manpages were written in docbook.
2023-02-10 06:40:00 +01:00
github-actions[bot] 65b4c3de4d terraform-providers.pagerduty: 2.9.3 → 2.10.2 2023-02-10 15:34:56 +10:00
github-actions[bot] 8395006cdf terraform-providers.ovh: 0.26.0 → 0.27.0 2023-02-10 15:34:56 +10:00
github-actions[bot] 4a1afe0365 terraform-providers.aws: 4.53.0 → 4.54.0 2023-02-10 15:34:56 +10:00
github-actions[bot] 3b683a98d7 terraform-providers.opentelekomcloud: 1.32.3 → 1.33.0 2023-02-10 15:34:56 +10:00
github-actions[bot] d052d4b930 terraform-providers.datadog: 3.20.0 → 3.21.0 2023-02-10 15:34:56 +10:00
github-actions[bot] 601c8363a0 terraform-providers.azurerm: 3.42.0 → 3.43.0 2023-02-10 15:34:56 +10:00
Weijia Wang 17a3ebd923
Merge pull request #215575 from andrewhamon/buck-is-broken
buck: mark broken on aarch64-darwin
2023-02-10 06:30:01 +01:00
7c6f434c 9e3a418a2f
Merge pull request #214384 from Atemu/update/govirt
libgovirt: 0.3.8 -> 0.3.9, virt-viewer: touchups
2023-02-10 05:29:02 +00:00
Weijia Wang 4dcc1a0c37
Merge pull request #215630 from r-ryantm/auto-update/conftest
conftest: 0.38.0 -> 0.39.0
2023-02-10 06:22:41 +01:00
Weijia Wang 3f47ae69c1
Merge pull request #215601 from r-ryantm/auto-update/spicedb
spicedb: 1.16.1 -> 1.16.2
2023-02-10 06:17:10 +01:00
Andrew Hamon 2cc4bbe553 buck: mark broken on aarch64-darwin 2023-02-10 06:03:35 +01:00
7c6f434c 8cef0411a6
Merge pull request #215272 from trofi/vifm-help
vifm: fix `:help` by pulling in `perl` to build depends
2023-02-10 05:03:12 +00:00
Nick Cao c60cac294a
Merge pull request #215315 from jtojnar/subl
sublime-merge: 2079 → 2083
2023-02-10 12:48:56 +08:00
Nick Cao ffe472eff8
Merge pull request #215625 from r-ryantm/auto-update/nats-server
nats-server: 2.9.12 -> 2.9.14
2023-02-10 12:45:47 +08:00