diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-05-20 00:02:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-20 00:02:29 +0000 |
| commit | 75906ed2452df77bf373d4b9d77848aa10d3a011 (patch) | |
| tree | 6290bd3f86accb53ab140d0ac24ac83d92d99e6b /doc | |
| parent | ac7627e62dac6b1cfe608b646dacf180a21a218f (diff) | |
| parent | d635ee99e38f683e6a6fa8da44847eb7e914acbd (diff) | |
| download | nixlib-75906ed2452df77bf373d4b9d77848aa10d3a011.tar nixlib-75906ed2452df77bf373d4b9d77848aa10d3a011.tar.gz nixlib-75906ed2452df77bf373d4b9d77848aa10d3a011.tar.bz2 nixlib-75906ed2452df77bf373d4b9d77848aa10d3a011.tar.lz nixlib-75906ed2452df77bf373d4b9d77848aa10d3a011.tar.xz nixlib-75906ed2452df77bf373d4b9d77848aa10d3a011.tar.zst nixlib-75906ed2452df77bf373d4b9d77848aa10d3a011.zip | |
Merge master into staging-next
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc-support/default.nix | 9 | ||||
| -rw-r--r-- | doc/using/configuration.chapter.md | 8 |
2 files changed, 17 insertions, 0 deletions
diff --git a/doc/doc-support/default.nix b/doc/doc-support/default.nix index 53990b677196..7c00195ab390 100644 --- a/doc/doc-support/default.nix +++ b/doc/doc-support/default.nix @@ -23,6 +23,14 @@ let <xsl:import href="${./parameters.xml}"/> </xsl:stylesheet> ''; + + # NB: This file describes the Nixpkgs manual, which happens to use module + # docs infra originally developed for NixOS. + optionsDoc = pkgs.nixosOptionsDoc { + inherit (pkgs.lib.evalModules { modules = [ ../../pkgs/top-level/config.nix ]; }) options; + documentType = "none"; + }; + in pkgs.runCommand "doc-support" {} '' mkdir result @@ -30,6 +38,7 @@ in pkgs.runCommand "doc-support" {} cd result ln -s ${locationsXml} ./function-locations.xml ln -s ${functionDocs} ./function-docs + ln -s ${optionsDoc.optionsDocBook} ./config-options.docbook.xml ln -s ${pkgs.docbook5}/xml/rng/docbook/docbook.rng ./docbook.rng ln -s ${pkgs.docbook_xsl_ns}/xml/xsl ./xsl diff --git a/doc/using/configuration.chapter.md b/doc/using/configuration.chapter.md index 932b24237c02..842450ebf47f 100644 --- a/doc/using/configuration.chapter.md +++ b/doc/using/configuration.chapter.md @@ -164,6 +164,14 @@ There are several ways to tweak how Nix handles a package which has been marked Note that `permittedInsecurePackages` is only checked if `allowInsecurePredicate` is not specified. +### `config` Options Reference + +The following attributes can be passed in [`config`](#chap-packageconfig). + +```{=docbook} +<include xmlns="http://www.w3.org/2001/XInclude" href="../doc-support/result/config-options.docbook.xml"/> +``` + ## Modify packages via `packageOverrides` {#sec-modify-via-packageOverrides} You can define a function called `packageOverrides` in your local `~/.config/nixpkgs/config.nix` to override Nix packages. It must be a function that takes pkgs as an argument and returns a modified set of packages. |