Commit Graph

3945 Commits

Author SHA1 Message Date
Robert Schütz
be55739ebb
Merge pull request #218025 from MrFreezeex/protonbridge-update
protonmail-bridge: 2.3.0 -> 3.0.18
2023-02-27 14:57:12 -08:00
Riley
c713217380
nixos/k3s: add environmentFile as an option
* k3s: add environmentFile option

Enabling to include secrets through configuration such as 'sops'

* Update nixos/doc/manual/release-notes/rl-2305.section.md

Co-authored-by: Jairo Llopis <973709+yajo@users.noreply.github.com>
2023-02-27 08:15:25 -03:00
github-actions[bot]
399e2c78d4
Merge master into staging-next 2023-02-26 06:01:09 +00:00
Anselm Schüler
9769e90233 lib/options: Add more options to mkPackageOption 2023-02-26 03:00:22 +01:00
Arthur Outhenin-Chalandre
47782b16c5
protonmail-bridge: 2.3.0 -> 3.0.18
Update protonmail-bridge to v3. This also rename the CLI executable from
protonmail-bridge to bridge to be more in line with upstream naming.

Co-authored-by: James Landrein <github@j4m3s.eu>
Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@proton.ch>
2023-02-25 01:41:39 +01:00
github-actions[bot]
7fb1a9172f
Merge master into staging-next 2023-02-24 00:02:22 +00:00
sternenseemann
d1fa5dd85c nixos/doc: don't prescribe OS / manual name
In general the man pages do not care what OS and manual they are shipped
with, so they don't get to choose the names of them. We were tempted to
do so, as we had inconsistently chosen OS names for the mandoc and
man-db/groff implementations. Since this has been rectified since, we
can just drop this boilerplate from the man pages.
2023-02-23 20:53:04 +01:00
github-actions[bot]
68dd6912f3
Merge master into staging-next 2023-02-22 18:01:07 +00:00
D Anzorge
bf02778b76 nixos/manual: fix typos in install instructions 2023-02-22 15:40:33 +01:00
Winter
1301a1a997 keepassx{,2}: drop
Upstream has officially abandoned the project as of 2021 [0], there's been
no release since 2016, it uses the EoL Qt 4, and alternatives like
KeePassXC exist.

Also move KeePassXC to its own directory -- it doesn't make sense to
have it in KeePassX's folder anymore.

[0]: https://www.keepassx.org/index.html%3Fp=636.html
2023-02-21 22:40:39 -05:00
github-actions[bot]
a160ec1116
Merge master into staging-next 2023-02-21 12:01:36 +00:00
Martin Weinelt
198713cf82
nixos/tts: init
Provide a module to configure Coqui TTS, available as `tts` in nixpkgs
for a few releases already.

The module supports multiple servers in parallel, so multiple languages
and testing scenarios can be covered, without affecting any production
usage.
2023-02-21 11:59:17 +01:00
github-actions[bot]
85ba84c218
Merge master into staging-next 2023-02-19 12:01:25 +00:00
Jonas Heinrich
553c376a49 nixos/networkd-dispatcher: init 2023-02-19 04:42:25 -05:00
Alyssa Ross
38f0121cce
Merge master (+ 11b095e revert) into staging-next
Conflicts:
	pkgs/development/libraries/libvisual/default.nix
2023-02-18 14:04:32 +00:00
pennae
81cf173256 nixos-render-docs: use multiprocessing for options
options processing is pretty slow right now, mostly because the
markdown-it-py parser is pure python (and with performance
pessimizations at that). options parsing *is* embarassingly parallel
though, so we can just fork out all the work to worker processes and
collect the results.

multiprocessing probably has a greater benefit on linux than on darwin
since the worker spawning method darwin uses is less efficient than
fork() on linux. this hasn't been tested on darwin, only on linux, but
if anything darwin will be faster with its preferred method.
2023-02-18 13:17:57 +01:00
github-actions[bot]
69a8c9e227
Merge master into staging-next 2023-02-18 00:02:21 +00:00
github-actions[bot]
1c50878b7b
Merge master into staging-next 2023-02-17 18:01:15 +00:00
Robert Hensing
9964891440 nixos/doc: Add Developing the Test Driver 2023-02-17 18:06:02 +01:00
Robert Hensing
b72592ee04
Merge pull request #215973 from pennae/nrd-manual-structure
nixos/manual: specify manual structure in markdown
2023-02-17 18:01:23 +01:00
pennae
122a7435fb Revert "nixos/jellyseerr: init"
This reverts commit 2ca375abdc77780b785cb297f4a52f1115801eaa.
2023-02-16 18:03:55 +01:00
genesis
2ca375abdc nixos/jellyseerr: init 2023-02-16 17:27:17 +01:00
github-actions[bot]
bf5abe92d4
Merge master into staging-next 2023-02-15 18:01:14 +00:00
Kim Lindberger
ad36a97de0
Merge pull request #175000 from shyim/add-opensearch
opensearch: init at 2.5.0
2023-02-15 18:11:53 +01:00
github-actions[bot]
1638d35583
Merge staging-next into staging 2023-02-15 12:01:56 +00:00
Vladimír Čunát
71f22e3aa6
Merge #214196: openssh: 9.1p1 -> 9.2p1 2023-02-15 11:33:13 +01:00
github-actions[bot]
58cfebde3e
Merge staging-next into staging 2023-02-15 00:02:50 +00:00
Soner Sayakci
8b84a720e8
nixos/doc: add release note for opensearch 2023-02-14 20:07:05 +00:00
Janne Heß
e918da4d48
openssh: 9.1p1 -> 9.2p1 2023-02-14 12:30:15 +01:00
K900
da6293b9b5 nixos/doc: add release note for Plasma 5.27 2023-02-14 14:15:58 +03:00
github-actions[bot]
f60ea3cf39
Merge staging-next into staging 2023-02-13 18:01:55 +00:00
Louis Bettens
afbdf8c54d cosmoc: drop 2023-02-13 07:32:21 -05:00
github-actions[bot]
8e2a123807
Merge staging-next into staging 2023-02-12 18:01:40 +00:00
pennae
bfc6975cbc nixos/manual: remove holdovers from docbook times
these files provided mainly or exclusively xml-related tooling and
support for editing the manual. since docbook is now an implementation
detail (except for still being allowed in option docs, for now) these
tools are no longer necessary, useful, or even functional.

xmlformat.conf is still used by the nixpkgs documentation, so we have to
keep it. there's no reason it can't go live with the nixpkgs docs though.
2023-02-12 14:23:38 +01:00
pennae
1229e735ac nixos-render-docs: add structural includes, use for manual
this adds support for structural includes to nixos-render-docs.
structural includes provide a way to denote the (sub)structure of the
nixos manual in the markdown source files, very similar to how we used
literal docbook blocks before, and are processed by nixos-render-docs
without involvement of xml tooling. this will ultimately allow us to
emit the nixos manual in other formats as well, e.g. html, without going
through docbook at all.

alternatives to this source layout were also considered:

a parallel structure using e.g. toml files that describe the document
tree and links to each part is possible, but much more complicated to
implement than the solution chosen here and makes it harder to follow
which files have what substructure. it also makes it much harder to
include a substructure in the middle of a file.

much the same goes for command-line arguments to the converter, only
that command-lined arguments are even harder to specify correctly and
cannot be reasonably pulled together from many places without involving
another layer of tooling. cli arguments would also mean that the manual
structure would be fixed in default.nix, which is also not ideal.
2023-02-12 13:02:42 +01:00
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
Robert Schütz
efee1b5234 nixos/imaginary: init 2023-02-11 09:18:42 -08:00
Vladimír Čunát
13e8ec1f2d
Merge branch 'staging-next' into staging 2023-02-10 13:46:44 +01:00
github-actions[bot]
f72b07e57d
Merge staging-next into staging 2023-02-10 06:01:53 +00: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
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