diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-14 00:02:12 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-14 00:02:12 +0000 |
commit | ea64a128d1ed70c40ce897d0d8cc569e2eb394cd (patch) | |
tree | 7c100fb9a45eeffc2013e0edac4287f3533f3110 /doc | |
parent | 38910351b753e23a1731fd95fa99765d3a21dcc5 (diff) | |
parent | 1073633d8914364109bf453af7bed0aa06e5f5bf (diff) | |
download | nixpkgs-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar nixpkgs-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar.gz nixpkgs-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar.bz2 nixpkgs-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar.lz nixpkgs-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar.xz nixpkgs-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar.zst nixpkgs-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.zip |
Merge master into staging-next
Diffstat (limited to 'doc')
-rw-r--r-- | doc/functions/library/attrsets.xml | 2 | ||||
-rw-r--r-- | doc/languages-frameworks/ocaml.section.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index a30f4edf4c1..052bfa1f6ae 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -1474,7 +1474,7 @@ lib.attrsets.zipAttrsWith <section xml:id="function-library-lib.attrsets.zipAttrs"> <title><function>lib.attrsets.zipAttrs</function></title> - <subtitle><literal>zipAttrsWith :: [ AttrSet ] -> AttrSet</literal> + <subtitle><literal>zipAttrs :: [ AttrSet ] -> AttrSet</literal> </subtitle> <xi:include href="./locations.xml" xpointer="lib.attrsets.zipAttrs" /> diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index 47035551d41..e4813d7dd2d 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -38,8 +38,8 @@ Here is a simple package example. - It uses the `fetchFromGitHub` fetcher to get its source. -- `useDune2 = true` ensures that the latest version of Dune is used for the - build (this may become the default value in a future release). +- `useDune2 = true` ensures that Dune version 2 is used for the + build (this is the default; set to `false` to use Dune version 1). - It sets the optional `doCheck` attribute such that tests will be run with `dune runtest -p angstrom` after the build (`dune build -p angstrom`) is |