Commit Graph

31734 Commits

Author SHA1 Message Date
Vladimír Čunát
f1f9ae6a3b
Merge #214010: staging-next 2023-02-01 2023-02-13 15:42:23 +01:00
Louis Bettens
afbdf8c54d cosmoc: drop 2023-02-13 07:32:21 -05:00
github-actions[bot]
0d7cb3a2aa
Merge master into staging-next 2023-02-13 06:01:30 +00:00
Nick Cao
48d6418a2e
Merge pull request #215696 from fee1-dead-contrib/matrix-appservice-discord.customize-package
nixos/appservice-discord: customizable `package`
2023-02-13 09:50:52 +08:00
github-actions[bot]
a55c80886c
Merge master into staging-next 2023-02-12 18:01:09 +00:00
Robert Schütz
7b60fce843
Merge pull request #215222 from dotlambda/nixos-imaginary-init
nixos/imaginary: init
2023-02-12 08:42:19 -08:00
github-actions[bot]
db256a18b5
Merge master into staging-next 2023-02-12 06:01:33 +00:00
Vanilla
3ba3e20347
nixos/virtualisation/linode-image: Migrate to new openssh options. 2023-02-12 13:06:11 +08:00
Nick Cao
3bd8cc7a90
Merge pull request #215795 from e1mo/fix-dokuwiki-acluse
nixos/dokuwiki: remove last reference to aclUse
2023-02-12 09:06:24 +08:00
github-actions[bot]
d5c6366a21
Merge master into staging-next 2023-02-12 00:02:30 +00:00
Nick Cao
a9335078db
Merge pull request #215740 from supermarin/patch-3
nixos/yubikey-agent: Add dependency to pcsd.service
2023-02-12 06:20:55 +08:00
github-actions[bot]
15bfb025ab
Merge master into staging-next 2023-02-11 18:01:19 +00:00
Andreas Stührk
8dade1f713 nixos/envoy: add option requireValidConfig to make config validation errors non-fatal
Co-authored-by: Vincent Haupert <vincent@yaxi.tech>
2023-02-11 18:21:21 +01:00
Vincent Haupert
84220a7098 nixos/envoy: add package option 2023-02-11 18:21:21 +01:00
Vincent Haupert
3c3da8768b nixos/envoy: further service hardening 2023-02-11 18:21:21 +01:00
Vincent Haupert
a36fc1d72a nixosTests.envoy: use port 80 to test CAP_NET_BIND_SERVICE 2023-02-11 18:21:21 +01:00
Vincent Haupert
8fff553f7e nixos/envoy: sort serviceConfig entries 2023-02-11 18:21:21 +01:00
Vincent Haupert
989a1a6ef5 nixos/envoy: use lists in serviceConfig where appropriate
Using type `list` instead of `str` in `serviceConfig` entries which
accept multiple values allows easier extension of the unit
configuration.
2023-02-11 18:21:21 +01:00
Robert Schütz
efee1b5234 nixos/imaginary: init 2023-02-11 09:18:42 -08:00
Marin
785cd824a3 nixos/yubikey-agent: Add dependency to pcsd.service
Issue: after installing, running `yubikey-agent -setup` produces the
following error:
```
nixOS: Failed to connect to the YubiKey: connecting to pscs: the Smart
card resource manager is not running
```

More on this issue: https://github.com/FiloSottile/yubikey-agent/issues/137
2023-02-11 09:32:24 -05:00
Naïm Favier
86a387351a
Merge branch 'master' into nixos/hostapd 2023-02-11 14:03:56 +01:00
Moritz 'e1mo' Fromm
e8b59a1e2e
nixos/dokuwiki: remove last reference to aclUse
This was overlooked in #209299, but will throw a trace when building a
system even when the setting was not set.
2023-02-11 11:12:51 +01:00
github-actions[bot]
e969c56b62
Merge master into staging-next 2023-02-11 00:02:21 +00:00
Sandro
9ee0410a57
Merge pull request #214702 from Tom-Hubrecht/onlyoffice 2023-02-10 23:07:32 +01:00
Arian van Putten
5b23d0e51c
Merge pull request #214396 from nikstur/systemd-repart
systemd-repart
2023-02-10 20:03:09 +01:00
Tom Hubrecht
405984ac13 nixos/onlyoffice: Fix initial permissions for the documentserver data 2023-02-10 19:16:19 +01:00
github-actions[bot]
42cf9b70d4
Merge master into staging-next 2023-02-10 18:01:23 +00:00
Deadbeef
e391cf368a nixos/appservice-discord: customizable package 2023-02-11 01:08:46 +08:00
Anderson Torres
e1ffcb46cd
Merge pull request #153098 from bb2020/udisks
nixos/udisks2: add mountOnMedia option
2023-02-10 13:50:57 -03:00
bb2020
61219651fe nixos/udisks2: add mountOnMedia option 2023-02-10 16:38:05 +03:00
nikstur
4700198654 nixos/systemd-repart: init 2023-02-10 14:05:44 +01:00
github-actions[bot]
9be52f693f
Merge master into staging-next 2023-02-10 12:01:38 +00:00
1sixth
06972ea1fe nixos/nitter: add replaceReddit option 2023-02-10 09:28:17 +01:00
github-actions[bot]
bff8e74964
Merge master into staging-next 2023-02-10 06:01:18 +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
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
Aaron Andersen
ce81c3ab72
Merge pull request #215554 from bb2020/dlna
nixos/minidlna: minor changes
2023-02-09 21:45:59 -05:00