diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-06-30 13:44:37 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-06-30 13:44:37 +0000 |
commit | 16f676d6bbd4f930b0017ccb20cebe5a29e17545 (patch) | |
tree | 0d554b4f16bdef502035b743457fc29ffcc5e7f7 /nixpkgs/doc/functions | |
parent | e7caacc4c122b7641bb66a4c2595289347a4996c (diff) | |
parent | 3a8d7958a610cd3fec3a6f424480f91a1b259185 (diff) | |
download | nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.gz nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.bz2 nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.lz nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.xz nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.zst nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.zip |
Merge commit '3a8d7958a610cd3fec3a6f424480f91a1b259185'
Diffstat (limited to 'nixpkgs/doc/functions')
-rw-r--r-- | nixpkgs/doc/functions/generators.section.md | 2 | ||||
-rw-r--r-- | nixpkgs/doc/functions/library.xml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nixpkgs/doc/functions/generators.section.md b/nixpkgs/doc/functions/generators.section.md index bb8426d8087b..d54e5027c799 100644 --- a/nixpkgs/doc/functions/generators.section.md +++ b/nixpkgs/doc/functions/generators.section.md @@ -49,7 +49,7 @@ str\:ange:"very::strange" merge:"diff3" ``` -::: note +::: {.note} Nix store paths can be converted to strings by enclosing a derivation attribute like so: `"${drv}"`. ::: diff --git a/nixpkgs/doc/functions/library.xml b/nixpkgs/doc/functions/library.xml index 6ffb944b5a60..21bcf5b88c9d 100644 --- a/nixpkgs/doc/functions/library.xml +++ b/nixpkgs/doc/functions/library.xml @@ -25,4 +25,6 @@ <xi:include href="./library/generated/debug.xml" /> <xi:include href="./library/generated/options.xml" /> + + <xi:include href="./library/generated/sources.xml" /> </section> |