3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

28413 commits

Author SHA1 Message Date
pennae 645cfa59ac nixos/make-option-docs: add xref support to markdown conversion 2022-08-03 22:01:14 +02:00
pennae 7a091b2686 nixos/make-options-doc: reuse markdown instance in mergeJSON
this doesn't construct a new (expensive) parser for every option, making
rendering about 30x faster.
2022-08-03 22:00:24 +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
K900 eabbad8af1
Merge pull request #185036 from K900/goblinization
make-initrd-ng: parse ELFs ourselves instead of shelling out to patchelf and friends
2022-08-03 19:57:55 +03:00
Stig b53684ba2b
Merge pull request #176640 from stigtsp/package/convos-7.02
convos: 6.42 -> 7.02
2022-08-03 11:45:27 +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
Valentin Gagarin 246cce5dc0
Merge pull request #183761 from leungbk/manual-typos
manual: fix typos
2022-08-03 11:08:00 +02:00
Janne Heß bc7ff29bdf
Merge pull request #184822 from snpschaaf/networkd-link-add-promiscious
add Promiscuous as valid value for linkConfig
2022-08-03 11:05:32 +02:00
Philippe Schaaf d5e7f6a613 add Promiscuous as valid value for linkConfig
configuring a network via
`systemd.network.networks.<name>.linkConfig`
does not allow to set the attr Promiscuous = "true";

This referes to:
https://www.freedesktop.org/software/systemd/man/systemd.network.html#Promiscuous=

Signed-off-by: Philippe Schaaf <philippe.schaaf@secunet.com>
2022-08-03 09:05:42 +02:00
Vladimír Čunát a0ebaa7431
Merge #183748: staging-next 2022-07-29 2022-08-03 09:04:16 +02:00
Florian Klink dfda3c3e04
Merge pull request #182577 from squalus/coredump
nixos: systemd-coredump: improve disabled state
2022-08-03 13:32:11 +07: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
Linus Heckemann 6fc909a1cc makeInitrdNG: make stripping fully optional
Now the tool will only strip binaries if a strip executable is passed
via the STRIP environment variable. This is exposed via the strip
option for makeInitrdNG and the NixOS option boot.initrd.systemd.strip.
2022-08-02 10:19:48 +03: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
squalus 257db1dd4a nixos: systemd-coredump: improve disabled state
The systemd-coredump module required systemd to be built with
withCoredump=true, even if the module was disabled.

- allow systemd to be missing systemd-coredump if the module is disabled
- switch to mkDefault for the sysctl config to allow user overrides when
  the module is disabled
- add nixos tests for both the enabled and disabled cases
2022-08-01 09:52:56 -07:00
Franz Pletz 999d90d2e7
Merge pull request #184553 from danc86/krb-no-pam 2022-08-01 16:30:07 +02:00
Thomas Gerbet 595932cd2b cosign: 1.9.0 -> 1.10.0
`cosigned` is no more part of the cosign repository and it has been moved
into a `sigstore/policy-controller` repository. A new package should probably
be created to replace it.

https://github.com/sigstore/cosign/releases/tag/v1.10.0
2022-08-01 16:26:26 +02: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
Dan Callaghan 43aab2f50b
nixos/pam: add an option to control Kerberos PAM modules
Instead of enabling the PAM modules based on config.krb5.enable,
introduce a new option to control the PAM modules specifically.

Users may want to turn on config.krb5.enable, to get a working Kerberos
client config with tools like kinit, while letting pam_sss or something
else handle Kerberos password lookups.
2022-08-01 21:28:05 +10:00
github-actions[bot] 83256fd7ea
Merge master into staging-next 2022-08-01 00:02:41 +00:00
superherointj 5857574d45
Merge pull request #183307 from Djabx/autoUpgrabe-boot
system.autoUpgrade: add boot option.
2022-07-31 19:12:59 -03:00
markuskowa 8cd811ca08
Merge pull request #184254 from ck3d/fix-test-machinectl
nixos/tests/systemd-machinectl: Fix resolved and UID shift check
2022-07-31 21:18:53 +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
Christian Kögler 68973d60a2 nixos/tests/systemd-machinectl: Fix resolved and UID shift check 2022-07-30 22:32:12 +02:00
superherointj 564e99c187
Merge pull request #182445 from euank/k3s-multi-node-test
nixos/tests/k3s: add multi-node test, test basic flannel networking
2022-07-30 16:47:21 -03:00
Euan Kemp b6da1d8198 nixos/tests/k3s: add multi-node test
This adds a basic multi-node test and verifies networking works between
em.
2022-07-30 11:55:32 -07:00
Euan Kemp aa579635b9 nixos/tests/k3s: wait for default service account in test
This lets us write a slightly simpler test, and more closely matches
actual k8s usage
2022-07-30 11:55:24 -07:00
Euan Kemp d5b1e25711 nixos/tests/k3s: reorganize test into a subdirectory
In preperation for more tests, coming soon.
2022-07-30 11:55:23 -07: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 153bfc9966
treewide: use isx86 where appropriate 2022-07-30 16:21:10 +00: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