Merge branch 'master' into staging-next

; Conflicts: ; pkgs/development/tools/codespell/default.nix codespell 2.2.2 switched to pyproject & setuptools_scm: https://github.com/codespell-project/codespell/pull/2523
2022-10-19 05:24:28 +02:00
parent a25e03e76a 1aa7d4e6c6
commit 457f28f6f8
229 changed files with 25072 additions and 1873 deletions
--- a/nixos/lib/make-options-doc/options-to-docbook.xsl
+++ b/nixos/lib/make-options-doc/options-to-docbook.xsl
@@ -40,8 +40,8 @@
            concat($optionIdPrefix,
              translate(
                attr[@name = 'name']/string/@value,
-                '*&lt; >[]:',
-                '_______'
+                '*&lt; >[]:&quot;',
+                '________'
            ))" />
          <varlistentry>
            <term xlink:href="#{$id}">