Commit graph

13713 commits

Author SHA1 Message Date
pennae
61e93df189 nixos/*: automatically convert option docs to MD
once again using nix-doc-munge (69d080323a)
2022-08-03 22:46:41 +02:00
pennae
3aebb4a2be nixos/*: normalize link format
make (almost) all links appear on only a single line, with no
unnecessary whitespace, using double quotes for attributes. this lets us
automatically convert them to markdown easily.

the few remaining links are extremely long link in a gnome module, we'll
come back to those at a later date.
2022-08-03 21:57:46 +02:00
pennae
9c8531c8a5 nixos/*: replace <replaceable>s with «thing»
we can't embed syntactic annotations of this kind in markdown code
blocks without yet another extension. replaceable is rare enough to make
this not much worth it, so we'll go with «thing» instead. the module
system already uses this format for its placeholder names in attrsOf
paths.
2022-08-03 21:08:58 +02:00
pennae
16102dce2f nixos/*: replace <code> in option docs with <literal>
markdown can't represent the difference without another extension and
both the html manual and the manpage render them the same, so keeping the
distinction is not very useful on its own. with the distinction removed
we can automatically convert many options that use <code> tags to markdown.

the manpage remains unchanged, html manual does not render
differently (but class names on code tags do change from "code" to "literal").
2022-08-03 21:03:23 +02:00
pennae
694d5b19d3 nixos/*: replace </para><para> with double linebreaks
our xslt already replaces double line breaks with a paragraph close and
reopen. not using explicit para tags lets nix-doc-munge convert more
descriptions losslessly.

only whitespace changes to generated documents, except for two
strongswan options gaining paragraph two breaks they arguably should've
had anyway.
2022-08-03 20:39:21 +02:00
Michele Guerini Rocco
f909bfde79
Merge pull request #184248 from SuperSandro2000/SuperSandro2000-patch-1
nixos/ncdns: replace shortened link
2022-08-03 11:23:04 +02:00
github-actions[bot]
537fbd1326
Merge master into staging-next 2022-08-03 00:02:25 +00:00
Sergei Trofimovich
1e8102cd58 nixos/openldap: fix option description markdown
Otherwise manual build fails as:

    $ nix build -f nixos/release.nix manual.x86_64-linux
    ...
     > NotImplementedError: ('md node not supported yet', 'services.openldap.declarativeContents', 'inline_html', ('<code>',))
     For full logs, run 'nix log /nix/store/pfa7bg3pflp0c31ma0rc2ahwqabs88dd-base-json-md-converted.drv'.
2022-08-02 23:11:24 +01:00
Michael Auchter
5c0e18a6bb nixos/soju: add defaults and assertions for TLS
Enabling soju without providing a value for tlsCertificate currently
results in:

  error: The option `services.soju.tlsCertificate' is used but not
  defined.

Since tlsCertificate is intended to be optional, set default to null.

Additionally, add assertions to ensure that both tlsCertificate and
tlsCertificateKey are either set or unset.
2022-08-02 17:36:04 +00:00
github-actions[bot]
1093a01c99
Merge master into staging-next 2022-08-02 12:01:37 +00:00
FliegendeWurst
48f4befd44
trilium: 0.51.2 -> 0.53.2 + update script (#177484)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-08-02 14:01:17 +02:00
github-actions[bot]
0f0010fda3
Merge master into staging-next 2022-08-02 06:02:34 +00:00
pennae
6b13dd0e9e
Merge pull request #183491 from pennae/automatic-md-conversions
treewide: automatically md-convert option descriptions
2022-08-02 02:15:30 +02:00
github-actions[bot]
ad090ff867
Merge master into staging-next 2022-08-02 00:02:24 +00:00
Winter
468c10d8e0
Merge pull request #183039 from jansol/master 2022-08-01 18:17:39 -04:00
Jan Solanti
34a04025cf xow: remove
Upstream project has been deprecated in favour of the 'xone' kernel
mode driver.
2022-08-02 00:50:32 +03:00
Bernardo Meurer
6f435e54b5
Merge pull request #165151 from vtuan10/klipper-firmware
nixos/klipper: Add Klipper firmware options
2022-08-01 14:07:26 -07:00
github-actions[bot]
e8ce2f4a26
Merge master into staging-next 2022-08-01 18:01:20 +00:00
Silvan Mosberger
fe2c9ae814
Merge pull request #177012 from hercules-ci/nixos-modular-system
`flake.lib.nixosSystem`: Allow `nixpkgs.system` to be set modularly; improve error message
2022-08-01 15:05:16 +02:00
Sandro
be194e390f
nixos/ncdns: replace shortened link 2022-07-31 17:13:03 +02:00
github-actions[bot]
bb10509584
Merge master into staging-next 2022-07-31 12:02:29 +00:00
Guillaume Girol
479522bd60
Merge pull request #178873 from greizgh/update-seafile
Fix broken seafile
2022-07-31 11:23:09 +00:00
github-actions[bot]
95abc5680d
Merge master into staging-next 2022-07-31 00:03:10 +00:00
Mario Rodas
a255355f46
Merge pull request #182520 from danc86/sssd-kcm
nixos/sssd: add an option to enable KCM support
2022-07-30 18:52:05 -05:00
github-actions[bot]
15686bdd94
Merge master into staging-next 2022-07-30 18:01:31 +00:00
Greizgh
dd8386c453
nixos/seafile: version 9.0x compatibility 2022-07-30 18:29:33 +02:00
Alyssa Ross
5330c0a1af
treewide: use isAarch where appropriate 2022-07-30 16:18:27 +00:00
pennae
2e751c0772 treewide: automatically md-convert option descriptions
the conversion procedure is simple:

 - find all things that look like options, ie calls to either `mkOption`
   or `lib.mkOption` that take an attrset. remember the attrset as the
   option
 - for all options, find a `description` attribute who's value is not a
   call to `mdDoc` or `lib.mdDoc`
 - textually convert the entire value of the attribute to MD with a few
   simple regexes (the set from mdize-module.sh)
 - if the change produced a change in the manual output, discard
 - if the change kept the manual unchanged, add some text to the
   description to make sure we've actually found an option. if the
   manual changes this time, keep the converted description

this procedure converts 80% of nixos options to markdown. around 2000
options remain to be inspected, but most of those fail the "does not
change the manual output check": currently the MD conversion process
does not faithfully convert docbook tags like <code> and <package>, so
any option using such tags will not be converted at all.
2022-07-30 15:16:34 +02:00
Aaron Andersen
2aecc7fdc1
Merge pull request #183360 from Sohalt/nixos/headscale
nixos/headscale: minor improvements
2022-07-30 15:02:37 +02:00
github-actions[bot]
93fa8bacfb
Merge master into staging-next 2022-07-30 06:01:19 +00:00
Anderson Torres
a34e3f299c
Merge pull request #183209 from AndersonTorres/nscde
fvwm3: init at 1.0.4
2022-07-29 21:10:55 -03:00
github-actions[bot]
50de8aa60e
Merge master into staging-next 2022-07-29 18:01:27 +00:00
pennae
6662f40c24
Merge pull request #182756 from jian-lin/pr-add-kanata-module
nixos/kanata: init
2022-07-29 15:08:34 +02:00
github-actions[bot]
a37c393ba4
Merge staging-next into staging 2022-07-29 12:02:05 +00:00
Jörg Thalheim
dfda4ec196
Merge pull request #183269 from flokli/grafana-agent-merge-defaults
nixos/grafana-agent: ensure defaults are merged
2022-07-29 11:38:47 +01:00
Florian Klink
7df5b81fc3 nixos/grafana-agent: ensure defaults are merged
Move the defaults to the `config` section of the module, and apply them
with mkDefault.

That way the defaults are merged with user-provided config, and are
merged without having to use lib.mkForce.
2022-07-29 13:23:12 +07:00
AndersonTorres
bef8e4df1d fvwm3: nixos module 2022-07-28 22:28:41 -03:00
AndersonTorres
2617a00699 fvwm: rename nixos module to fvwm2 2022-07-28 22:28:39 -03:00
github-actions[bot]
6a1cd17d72
Merge staging-next into staging 2022-07-28 18:01:55 +00:00
misuzu
9b1db3db0e nixos/gitlab-runner: undeprecate configFile option 2022-07-28 17:16:55 +02:00
misuzu
b4028126f1 nixos/gitlab-runner: add settings option 2022-07-28 17:16:55 +02:00
github-actions[bot]
437247fc43
Merge staging-next into staging 2022-07-28 12:02:23 +00:00
Sandro
b5b9c81496
Merge pull request #177573 from asbachb/bugfix/gitea/175967 2022-07-28 13:55:11 +02:00
Bernardo Meurer
2d070e3213
Merge pull request #182535 from lovesegfault/roon-hqplayerd-fixes
nixos/{roon,hqplayerd}: small fixes
2022-07-28 00:27:15 -07:00
github-actions[bot]
c5298a170d
Merge staging-next into staging 2022-07-27 18:02:13 +00:00
Alan Strohm
81cd3e229c
nixos/restic: add 'backups.package' option to override the restic package (#183028) 2022-07-27 13:47:41 -04:00
Bobby Rong
36d7b18e75
Merge pull request #162980 from NickCao/mautrix-telegram-nixos
nixos/mautrix-telegram: add lottieconverter to path
2022-07-27 20:39:08 +08:00
github-actions[bot]
54f2dacce1
Merge staging-next into staging 2022-07-27 00:03:09 +00:00
Rick van Schijndel
9e9f6fc1c3
Merge pull request #152065 from chkno/stunnel-extraConfig
nixos/stunnel: Make free-form
2022-07-26 23:24:31 +02:00
github-actions[bot]
52e7c12c41
Merge staging-next into staging 2022-07-26 06:02:58 +00:00