Commit graph

31724 commits

Author SHA1 Message Date
github-actions[bot] 1c178195e0
Merge staging-next into staging 2023-02-10 18:01:57 +00:00
github-actions[bot] 42cf9b70d4
Merge master into staging-next 2023-02-10 18:01:23 +00: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
Vladimír Čunát 13e8ec1f2d
Merge branch 'staging-next' into staging 2023-02-10 13:46: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] f72b07e57d
Merge staging-next into staging 2023-02-10 06:01:53 +00: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
Nick Cao 4ba33a758f
Merge pull request #215489 from Alper-Celik/master
nixos/plasma5: use vlc phonon backend by default
2023-02-10 09:27:37 +08:00
github-actions[bot] 0417b0e54f
Merge staging-next into staging 2023-02-10 00:03:00 +00:00
github-actions[bot] 71c0c6d984
Merge master into staging-next 2023-02-10 00:02:27 +00:00
bb2020 76bf633dc2 nixos/minidlna: minor changes 2023-02-09 21:11:20 +03:00
Alvar Penning 63dd9fb5c8 nixos/ympd: Unit hardening
Next to some systemd unit hardening, the nobody user isn't used anymore,
as suggested in #55370.
2023-02-09 19:10:19 +01:00
github-actions[bot] 87e315024e
Merge staging-next into staging 2023-02-09 18:01:44 +00:00
github-actions[bot] b5d4dad2b8
Merge master into staging-next 2023-02-09 18:01:11 +00:00
Robert Hensing 1991c40759
Merge pull request #194345 from codedownio/binary-cache
Introduce mkBinaryCache function
2023-02-09 15:25:16 +01:00
github-actions[bot] 8c32008a02
Merge staging-next into staging 2023-02-09 12:02:05 +00:00
github-actions[bot] c76e040c19
Merge master into staging-next 2023-02-09 12:01:30 +00:00
Alper Çelik 0b74f9829f
nixos/plasma5: use vlc phonon backend by default 2023-02-09 13:53:28 +03:00
Nick Cao 6fa2bfdf4d
Merge pull request #215110 from gador/pgadmin-use-pstgresqltesthook
pgadmin4-desktopmode: init at 6.19, pgadmin4: simplify tests
2023-02-09 16:05:44 +08:00
Florian Brandes a380674d85
pgadmin4: add option to enable desktop mode
By default, pgadmin4 uses SERVER_MODE = True. This requires
access to system directories (e.g. /var/lib/pgadmin). There is
no easy way to change this mode during runtime. One has to change
or add config files withing pgadmin's directory structure to change it
or add a system-wide config file under `/etc/pgadmin`[1].

This isn't always easy to achive or may not be possible at all. For
those usecases this implements a switch in the pgadmin4 derivation and
adds a new top-level package `pgadmin4-desktopmode`. This builds in
DESKTOP MODE and allows the usage of pgadmin4 without the nixOS module
and without access to system-wide directories.

pgadmin4 module saves the configuration to /etc/pgadmin/config_system.py
pgadmin4-desktopmode tries to read that as well. This normally fails with
a PermissionError, as the config file is owned by the user of the pgadmin module.

With the check-system-config-dir.patch this will just throw a warning
but will continue and not read the file.

If we run pgadmin4-desktopmode as root
(something one really shouldn't do), it can read the config file and fail,
because of the wrong config for desktopmode.

[1]https://www.pgadmin.org/docs/pgadmin4/latest/config_py.html

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-02-09 08:19:05 +01:00
Florian Brandes 2b63943be4 nixosTests.pgadmin4-standalone: format
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-02-09 08:06:54 +01:00
Florian Brandes e4488f5efe pgadmin4: move package tests back into the package
We test pgadmin in nixosTests, because it needs a running postgresql instance.
This is now unnecessary since we can do so in the package itself.

This reduces the complexity of pgadmin and removes the need for the extra
nixosTests.

Also setting SERVER_MODE in `pkg/pip/setup_pip.py` does not have any effect
on the final package, so we remove it.
In NixOS, we use the module, which expects SERVER_MODE to be true (which it defaults to).
In non-NixOS installations, we will need the directory /var/lib/pgadmin and /var/log/pgadmin

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-02-09 08:06:52 +01:00
github-actions[bot] bd14a95898
Merge staging-next into staging 2023-02-09 06:01:47 +00:00
github-actions[bot] 73fe6149d4
Merge master into staging-next 2023-02-09 06:01:10 +00:00
Nick Cao aef8797863
Merge pull request #215345 from Izorkin/fix-coredump-id
nixos/systemd-coredump: fix group id
2023-02-09 13:52:05 +08:00
Nick Cao e95397343c
Merge pull request #215369 from IndeedNotJames/caddy
caddy: 2.6.2 -> 2.6.3
2023-02-09 12:06:41 +08:00
IndeedNotJames f5a06f7150
nixos/caddy: fix caddy fmt for caddy v2.6.3
The nixos module uses `caddy fmt` to *format* the generated Caddyfile.
v2.6.3 slightly altered `caddy fmt`'s behavior.

Excerpt from https://github.com/caddyserver/caddy/releases/tag/v2.6.3
> cmd: caddy fmt return code is 1 if not formatted
> cmd: fmt exit successfully after overwriting config file

Which is why the internal `Caddyfile-formatted` now uses `cp` and `caddy fmt --overwrite` instead
2023-02-09 03:36:10 +01:00
github-actions[bot] bece38afcc
Merge staging-next into staging 2023-02-09 00:02:56 +00:00
github-actions[bot] 1f23f5ae02
Merge master into staging-next 2023-02-09 00:02:26 +00:00
Justin Bedő f2ab8c706d
Merge pull request #158486 from ShamrockLee/singularity-apptainer
singularity: fix defaultPath and reflect upstream changes
2023-02-08 23:47:32 +00:00
Vladimír Čunát 1e42908aa7
Merge branch 'master' into staging-next 2023-02-08 21:50:23 +01:00
Izorkin 6b9583e5e1
nixos/systemd-coredump: fix group id 2023-02-08 20:48:13 +03:00